From 44317430a1fb1fe7546946b277261196a89e2b89 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Fri, 16 May 2014 16:48:56 +0000 Subject: [PATCH] misc: some source code cleanup. --- bootstrap | 11 +++++++++-- caca/attr.c | 2 +- caca/codec/codec.h | 2 +- caca/codec/import.c | 2 +- caca/codec/text.c | 2 +- caca/driver/ncurses.c | 2 +- caca/driver/x11.c | 2 +- configure.ac | 2 +- examples/conio.c | 2 +- ruby/caca-canvas.c | 2 +- src/cacaserver.c | 6 +++--- tools/sortchars.c | 2 +- 12 files changed, 22 insertions(+), 15 deletions(-) diff --git a/bootstrap b/bootstrap index 0ccb35d..66a8ad7 100755 --- a/bootstrap +++ b/bootstrap @@ -36,14 +36,21 @@ aclocalflags="`sed -ne 's/^[ \t]*ACLOCAL_AMFLAGS[ \t]*=//p' Makefile.am 2>/dev/n # Check for automake amvers="no" -for v in 13 12 11 10 9 8 7 6 5; do +v=5 +tries=0 +while : ; do if automake-1.${v} --version >/dev/null 2>&1; then amvers="-1.${v}" - break + tries=0 elif automake1.${v} --version >/dev/null 2>&1; then amvers="1.${v}" + tries=0 + fi + if [ "$tries" = 20 ]; then break fi + v="$((v + 1))" + tries="$((tries + 1))" done if test "${amvers}" = "no" && automake --version > /dev/null 2>&1; then diff --git a/caca/attr.c b/caca/attr.c index 223fd82..afb0584 100644 --- a/caca/attr.c +++ b/caca/attr.c @@ -1,6 +1,6 @@ /* * libcaca Colour ASCII-Art library - * Copyright (c) 2002-2012 Sam Hocevar + * Copyright (c) 2002-2014 Sam Hocevar * All Rights Reserved * * This library is free software. It comes without any warranty, to diff --git a/caca/codec/codec.h b/caca/codec/codec.h index ae8acd5..a86cc87 100644 --- a/caca/codec/codec.h +++ b/caca/codec/codec.h @@ -1,6 +1,6 @@ /* * libcaca Colour ASCII-Art library - * Copyright (c) 2002-2012 Sam Hocevar + * Copyright (c) 2002-2014 Sam Hocevar * 2006 Jean-Yves Lamoureux * All Rights Reserved * diff --git a/caca/codec/import.c b/caca/codec/import.c index 4607907..f366336 100644 --- a/caca/codec/import.c +++ b/caca/codec/import.c @@ -1,6 +1,6 @@ /* * libcaca Colour ASCII-Art library - * Copyright (c) 2002-2012 Sam Hocevar + * Copyright (c) 2002-2014 Sam Hocevar * All Rights Reserved * * This library is free software. It comes without any warranty, to diff --git a/caca/codec/text.c b/caca/codec/text.c index d33249c..d26a626 100644 --- a/caca/codec/text.c +++ b/caca/codec/text.c @@ -1,6 +1,6 @@ /* * libcaca Colour ASCII-Art library - * Copyright (c) 2002-2012 Sam Hocevar + * Copyright (c) 2002-2014 Sam Hocevar * 2006 Jean-Yves Lamoureux * All Rights Reserved * diff --git a/caca/driver/ncurses.c b/caca/driver/ncurses.c index bac80d6..7171e91 100644 --- a/caca/driver/ncurses.c +++ b/caca/driver/ncurses.c @@ -1,6 +1,6 @@ /* * libcaca Colour ASCII-Art library - * Copyright (c) 2002-2012 Sam Hocevar + * Copyright (c) 2002-2014 Sam Hocevar * 2007 Ben Wiley Sittler * All Rights Reserved * diff --git a/caca/driver/x11.c b/caca/driver/x11.c index 61781ad..6bd04cf 100644 --- a/caca/driver/x11.c +++ b/caca/driver/x11.c @@ -1,6 +1,6 @@ /* * libcaca Colour ASCII-Art library - * Copyright (c) 2002-2012 Sam Hocevar + * Copyright (c) 2002-2014 Sam Hocevar * 2007 Ben Wiley Sittler * All Rights Reserved * diff --git a/configure.ac b/configure.ac index 400a4cf..e763c98 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ AC_CONFIG_AUX_DIR(.auto) AC_CANONICAL_SYSTEM dnl We cannot use subdir-objects because of a bug that will eg. remove dnl ../src/.deps upon distclean when a file from ../src/ is used. -AM_INIT_AUTOMAKE([no-define tar-ustar silent-rules]) +AM_INIT_AUTOMAKE([no-define tar-ustar silent-rules subdir-objects]) dnl AM_MAINTAINER_MODE AM_DEFAULT_VERBOSITY=0 diff --git a/examples/conio.c b/examples/conio.c index 8ebbe9c..388983f 100644 --- a/examples/conio.c +++ b/examples/conio.c @@ -16,7 +16,7 @@ */ /*Ported to libcaca - *Copyright (c) 2009-2010 Sam Hocevar + *Copyright (c) 2009-2014 Sam Hocevar */ #include "config.h" diff --git a/ruby/caca-canvas.c b/ruby/caca-canvas.c index 70e3854..43a3ad4 100644 --- a/ruby/caca-canvas.c +++ b/ruby/caca-canvas.c @@ -1,6 +1,6 @@ /* * libcaca Ruby bindings - * Copyright (c) 2007-2012 Pascal Terjan + * Copyright (c) 2007-2014 Pascal Terjan * * This library is free software. It comes without any warranty, to * the extent permitted by applicable law. You can redistribute it diff --git a/src/cacaserver.c b/src/cacaserver.c index 696a7a0..825c3d4 100644 --- a/src/cacaserver.c +++ b/src/cacaserver.c @@ -1,7 +1,7 @@ /* * cacaserver Colour ASCII-Art library * Copyright (c) 2006 Jean-Yves Lamoureux - * 2006-2012 Sam Hocevar + * 2006-2014 Sam Hocevar * All Rights Reserved * * This program is free software. It comes without any warranty, to @@ -321,10 +321,10 @@ static void manage_connections(struct server *server) { server->clients = malloc(sizeof(struct client)); if(server->clients == NULL) - { + { close(fd); return; - } + } } else { diff --git a/tools/sortchars.c b/tools/sortchars.c index 4760941..fa28e16 100644 --- a/tools/sortchars.c +++ b/tools/sortchars.c @@ -1,6 +1,6 @@ /* * sortchars analyse ASCII characters - * Copyright (c) 2007-2012 Sam Hocevar + * Copyright (c) 2007-2014 Sam Hocevar * All Rights Reserved * *