From d53ca5f67d229717a3593ca9320e83bf68f1b05e Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Tue, 20 May 2008 06:27:28 -0600 Subject: [PATCH] Resynchronize argz whitespace changes from gnulib. * libltdl/m4/argz.m4: Kill trailing whitespace. * libltdl/argz.c: Likewise. Signed-off-by: Eric Blake --- ChangeLog | 6 ++++++ libltdl/argz.c | 4 ++-- libltdl/m4/argz.m4 | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e60db3d97..1ec69aea4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-05-20 Eric Blake + + Resynchronize argz whitespace changes from gnulib. + * libltdl/m4/argz.m4: Kill trailing whitespace. + * libltdl/argz.c: Likewise. + 2008-05-19 Eric Blake Fix regression from two days ago. diff --git a/libltdl/argz.c b/libltdl/argz.c index 9576a62de..f31ce176c 100644 --- a/libltdl/argz.c +++ b/libltdl/argz.c @@ -241,7 +241,7 @@ argz_count (const char *argz, size_t argz_len) size_t count = 0; assert ((argz && argz_len) || (!argz && !argz_len)); - + while (argz_len > 0) { size_t part_len = strlen (argz); @@ -249,6 +249,6 @@ argz_count (const char *argz, size_t argz_len) argz_len -= part_len + 1; count++; } - + return count; } diff --git a/libltdl/m4/argz.m4 b/libltdl/m4/argz.m4 index edc99bbce..37c1b11e4 100644 --- a/libltdl/m4/argz.m4 +++ b/libltdl/m4/argz.m4 @@ -28,14 +28,14 @@ ARGZ_H= AC_CHECK_FUNCS([argz_add argz_append argz_count argz_create_sep argz_insert \ argz_next argz_stringify], [], [ARGZ_H=argz.h; AC_LIBOBJ([argz])]) -dnl if have system argz functions, allow forced use of +dnl if have system argz functions, allow forced use of dnl libltdl-supplied implementation (and default to do so dnl on "known bad" systems). Could use a runtime check, but dnl (a) detecting malloc issues is notoriously unreliable dnl (b) only known system that declares argz functions, dnl provides them, yet they are broken, is cygwin dnl releases prior to 16-Mar-2007 (1.5.24 and earlier) -dnl So, it's more straightforward simply to special case +dnl So, it's more straightforward simply to special case dnl this for known bad systems. AS_IF([test -z "$ARGZ_H"], [AC_CACHE_CHECK( -- 2.47.2