[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 21/25] syntax-check: fix violations and implement sc_trailing_bla
|
From: |
Gary V. Vaughan |
|
Subject: |
[PATCH 21/25] syntax-check: fix violations and implement sc_trailing_blank-non-rfc3676. |
|
Date: |
Tue, 15 Nov 2011 19:53:59 +0700 |
* cfg.mk (local-checks-to-fix): Move sc_trailing_blank from
here...
(local-checks-to-skip): ...to here, because otherwise it flags
valid RFC3676 signature blocks.
(sc_trailing_blank-non-rfc3676): An improved sc_trailing_blank
implementation that doesn't flag signature blocks as violations.
* Makefile.am, bootstrap.conf, doc/PLATFORMS,
libltdl/config/ltmain.m4sh, libltdl/m4/libtool.m4,
libltdl/m4/lt~obsolete.m4, tests/archive-in-archive.at,
tests/convenience.at, tests/darwin.at, tests/depdemo/l1/l1.c,
tests/depdemo/l2/l2.c, tests/depdemo/l3/l3.c,
tests/depdemo/l4/l4.c, tests/f77demo/README,
tests/f77demo/cprogram.c, tests/f77demo/foof.f,
tests/f77demo/foof2.f, tests/f77demo/foof3.f,
tests/f77demo/fprogram.f, tests/fcdemo/README,
tests/fcdemo/cprogram.c, tests/fcdemo/foof.f90,
tests/fcdemo/foof2.f90, tests/fcdemo/foof3.f90,
tests/fcdemo/fprogram.f90, tests/mdemo/README,
tests/mdemo/main.c, tests/mdemo/mlib.c, tests/objectlist.test,
tests/static.at, tests/template.at, tests/testsuite.at: Remove
trailing blanks.
Signed-off-by: Gary V. Vaughan <address@hidden>
---
bootstrap.conf | 2 +-
build-aux/extract-trace | 4 ++--
build-aux/ltmain.m4sh | 2 +-
build-aux/options-parser | 2 +-
cfg.mk | 11 +++++++++--
doc/PLATFORMS | 2 +-
libtoolize.m4sh | 2 +-
m4/libtool.m4 | 2 +-
m4/lt~obsolete.m4 | 2 +-
tests/archive-in-archive.at | 2 +-
tests/convenience.at | 8 ++++----
tests/darwin.at | 2 +-
tests/depdemo/l1/l1.c | 2 +-
tests/depdemo/l2/l2.c | 2 +-
tests/depdemo/l3/l3.c | 2 +-
tests/depdemo/l4/l4.c | 2 +-
tests/f77demo/README | 6 +++---
tests/f77demo/cprogram.c | 18 +++++++++---------
tests/f77demo/foof.f | 2 --
tests/f77demo/foof2.f | 2 --
tests/f77demo/foof3.f | 2 --
tests/f77demo/fprogram.f | 2 --
tests/fcdemo/README | 6 +++---
tests/fcdemo/cprogram.c | 18 +++++++++---------
tests/fcdemo/foof.f90 | 3 +--
tests/fcdemo/foof2.f90 | 3 +--
tests/fcdemo/foof3.f90 | 3 +--
tests/fcdemo/fprogram.f90 | 3 +--
tests/mdemo/README | 4 ++--
tests/mdemo/main.c | 20 ++++++++++----------
tests/mdemo/mlib.c | 16 ++++++++--------
tests/objectlist.test | 2 +-
tests/static.at | 10 +++++-----
tests/template.at | 2 +-
tests/testsuite.at | 2 +-
35 files changed, 84 insertions(+), 89 deletions(-)
diff --git a/bootstrap.conf b/bootstrap.conf
index 91f77a7..4e6fd9f 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -446,7 +446,7 @@ libtool_require_package_url ()
$require_configure_ac
func_extract_trace AC_INIT
-
+
save_IFS="$IFS"
IFS=:
set dummy $func_extract_trace_result
diff --git a/build-aux/extract-trace b/build-aux/extract-trace
index a230140..a4322ec 100755
--- a/build-aux/extract-trace
+++ b/build-aux/extract-trace
@@ -139,7 +139,7 @@ One of these is required:
# Attempt to run `CMD --version', discarding errors. The output can be
# ignored by redirecting stdout, and this function used simply to test
# whether the command exists and exits normally when passed a
-# `--version' argument.
+# `--version' argument.
# When FATAL-ERROR-MSG is given, then this function will display the
# message and exit if running `CMD --version' returns a non-zero exit
# status.
@@ -322,7 +322,7 @@ func_extract_trace ()
# Dummy definitions for the macros we want to trace.
# AM_INIT_AUTOMAKE at least produces no trace without this.
'
-
+
_G_save=$IFS
IFS=,
for _G_macro in $_G_macros; do
diff --git a/build-aux/ltmain.m4sh b/build-aux/ltmain.m4sh
index 7282ad2..ffef3ea 100644
--- a/build-aux/ltmain.m4sh
+++ b/build-aux/ltmain.m4sh
@@ -732,7 +732,7 @@ func_convert_core_path_wine_to_w32 ()
{
$debug_cmd
- # unfortunately, winepath doesn't convert paths, only file names
+ # unfortunately, winepath doesn't convert paths, only file names
func_convert_core_path_wine_to_w32_result=""
if test -n "$1"; then
oldIFS=$IFS
diff --git a/build-aux/options-parser b/build-aux/options-parser
index 4f03dce..a299ade 100644
--- a/build-aux/options-parser
+++ b/build-aux/options-parser
@@ -321,7 +321,7 @@ func_run_hooks ()
#
# # Note that for efficiency, we parse as many options as we can
# # recognise in a loop before passing the remainder back to the
-# # caller on the first unrecognised argument we encounter.
+# # caller on the first unrecognised argument we encounter.
# while test $# -gt 0; do
# opt=$1; shift
# case $opt in
diff --git a/cfg.mk b/cfg.mk
index 24bfbe1..f92039a 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -41,21 +41,27 @@ local-checks-to-fix = \
sc_prohibit_always-defined_macros \
sc_prohibit_always_true_header_tests \
sc_require_config_h \
- sc_require_config_h_first \
- sc_trailing_blank
+ sc_require_config_h_first
local-checks-to-skip = \
$(local-checks-to-fix) \
sc_GPL_version \
sc_bindtextdomain \
sc_program_name \
+ sc_trailing_blank \
sc_unmarked_diagnostics
# GPL_version: checks for GPLv3, which we don't use
# bindtextdomain: libtool isn't internationalized
# program_name: libtool has no programs!
+# trailing_blank: flags valid rfc3676 separators
# unmarked_diagnostics: libtool isn't internationalized
+sc_trailing_blank-non-rfc3676:
+ @prohibit='([^-][^-][ ][ ]*|^[ ][ ]*)$$' \
+ halt='found trailing blank(s)' \
+ $(_sc_search_regexp)
+
# List syntax-check exempted files.
exclude_file_name_regexp--sc_error_message_uppercase = \
^$(_build-aux)/cvsu$$
@@ -64,3 +70,4 @@ exclude_file_name_regexp--sc_prohibit_strcmp = \
exclude_file_name_regexp--sc_prohibit_test_minus_ao = \
^m4/libtool.m4$$
exclude_file_name_regexp--sc_space_tab = \.diff$$
+exclude_file_name_regexp--sc_trailing_blank-non-rfc3676 = \.diff$$
diff --git a/doc/PLATFORMS b/doc/PLATFORMS
index a724144..eb8ee73 100644
--- a/doc/PLATFORMS
+++ b/doc/PLATFORMS
@@ -110,7 +110,7 @@ mips-sgi-irix5.2 cc 1.3b ok
mips-sni-sysv4 cc 1.3.5 ok
(Siemens C-compiler)
mips-sni-sysv4 gcc 1.3.5 ok
- (gcc-2.7.2.3, GNU assembler 2.8.1, native ld)
+ (gcc-2.7.2.3, GNU assembler 2.8.1, native ld)
mipsel-unknown-openbsd2.1 gcc 1.0 ok
powerpc-apple-darwin6.4 gcc 1.5 ok
(apple dev tools released 12/2002)
diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index e337461..be44973 100644
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -1409,7 +1409,7 @@ func_require_ac_ltdl_mode ()
*" recursive "*) ac_ltdl_mode=recursive ;;
*" subproject "*) ac_ltdl_mode=subproject ;;
esac
-
+
require_ac_ltdl_mode=:
}
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index a3ac26d..a9e20cf 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1195,7 +1195,7 @@ fi
# Invoke $ECHO with all args, space-separated.
func_echo_all ()
{
- $ECHO "$*"
+ $ECHO "$*"
}
case "$ECHO" in
diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4
index c573da9..ffeab56 100644
--- a/m4/lt~obsolete.m4
+++ b/m4/lt~obsolete.m4
@@ -25,7 +25,7 @@
# included after everything else. This provides aclocal with the
# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
# because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
#
# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
# Yes, that means every name once taken will need to remain here until
diff --git a/tests/archive-in-archive.at b/tests/archive-in-archive.at
index fd67c7d..5cd6d77 100644
--- a/tests/archive-in-archive.at
+++ b/tests/archive-in-archive.at
@@ -44,7 +44,7 @@ $LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c -o
foo.lo foo.c
$LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c -o bar.lo bar.c
$LIBTOOL --mode=link --tag=CC --tag=disable-shared $CC $CFLAGS $LDFLAGS \
-o libfoo.la foo.lo -version-info 1:0:0 -rpath $thisdir
-$LIBTOOL --mode=install cp libfoo.la $thisdir
+$LIBTOOL --mode=install cp libfoo.la $thisdir
eval `$EGREP '^(old_library)=' < libfoo.la`
libfoo=$old_library
AT_CHECK([$LIBTOOL --mode=link --tag=CC --tag=disable-shared $CC $CFLAGS
$LDFLAGS \
diff --git a/tests/convenience.at b/tests/convenience.at
index f076e61..0f6a0e2 100644
--- a/tests/convenience.at
+++ b/tests/convenience.at
@@ -43,7 +43,7 @@ cat >main3.c <<EOF
extern int a1(void), a2(void), a3(void);
int main(void) { return a1() + a2() + a3() != 6; }
EOF
-for i in 1 2 3; do
+for i in 1 2 3; do
echo "int a$i(void) { return $i; }" > a$i.c
$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c main$i.c
$LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c a$i.c
@@ -83,7 +83,7 @@ cat >main3.cpp <<EOF
extern int a1(void), a2(void), a3(void);
int main(void) { return a1() + a2() + a3() != 6; }
EOF
-for i in 1 2 3; do
+for i in 1 2 3; do
echo "int a$i(void) { return $i; }" > a$i.cpp
$LIBTOOL --tag=CXX --mode=compile $CXX $CXXFLAGS -c main$i.cpp
$LIBTOOL --tag=CXX --mode=compile $CXX $CXXFLAGS -c a$i.cpp
@@ -136,7 +136,7 @@ cat >main3.f <<EOF
end
EOF
-for i in 1 2 3; do
+for i in 1 2 3; do
cat >a$i.f <<EOF
subroutine a$i(res)
implicit none
@@ -196,7 +196,7 @@ cat >main3.f <<EOF
end
EOF
-for i in 1 2 3; do
+for i in 1 2 3; do
cat >a$i.f <<EOF
subroutine a$i(res)
implicit none
diff --git a/tests/darwin.at b/tests/darwin.at
index b255abe..6eab4cd 100644
--- a/tests/darwin.at
+++ b/tests/darwin.at
@@ -36,7 +36,7 @@ int main() { return 0;}
$noskip && {
$CC $CPPFLAGS $CFLAGS -arch ppc -arch i386 -o simple simple.c 2>&1 > /dev/null
|| noskip=false
-rm -f simple
+rm -f simple
}
AT_CHECK([$noskip || (exit 77)])
diff --git a/tests/depdemo/l1/l1.c b/tests/depdemo/l1/l1.c
index d7c6c1e..715a91e 100644
--- a/tests/depdemo/l1/l1.c
+++ b/tests/depdemo/l1/l1.c
@@ -37,5 +37,5 @@ func_l1 (int indent)
putchar(' ');
printf("l1 (%i)\n", var_l1);
var_l1++;
- return 0;
+ return 0;
}
diff --git a/tests/depdemo/l2/l2.c b/tests/depdemo/l2/l2.c
index b545332..76b7e60 100644
--- a/tests/depdemo/l2/l2.c
+++ b/tests/depdemo/l2/l2.c
@@ -40,5 +40,5 @@ func_l2 (int indent)
printf("l2 (%i)\n", var_l2);
func_l1(indent+1);
var_l2 += var_l1;
- return 0;
+ return 0;
}
diff --git a/tests/depdemo/l3/l3.c b/tests/depdemo/l3/l3.c
index 6056907..33910e6 100644
--- a/tests/depdemo/l3/l3.c
+++ b/tests/depdemo/l3/l3.c
@@ -42,5 +42,5 @@ func_l3 (int indent)
func_l1(indent+1);
func_l2(indent+1);
var_l3 += var_l1 + var_l2;
- return 0;
+ return 0;
}
diff --git a/tests/depdemo/l4/l4.c b/tests/depdemo/l4/l4.c
index 068a0d9..0ff2e33 100644
--- a/tests/depdemo/l4/l4.c
+++ b/tests/depdemo/l4/l4.c
@@ -44,5 +44,5 @@ func_l4 (int indent)
putchar(' ');
printf("libm [sin(1.5) = %f]\n", sin(1.5));
var_l4 += var_l3;
- return 0;
+ return 0;
}
diff --git a/tests/f77demo/README b/tests/f77demo/README
index 1417e72..e23e69b 100644
--- a/tests/f77demo/README
+++ b/tests/f77demo/README
@@ -1,12 +1,12 @@
This is a short demo of the fortran support in libtool.
-fprogram is a pure-fortran program which is linked
+fprogram is a pure-fortran program which is linked
against the fortran-only library libfoo.la
cprogram is a C program, which is linked against the
mixed C and fortran library libmix.la. The program
-calls a C function, which in turn calls a fortran
+calls a C function, which in turn calls a fortran
function.
-This demo requires GNU autoconf, automake,
+This demo requires GNU autoconf, automake,
libtool with the F77 tag and quite obvious Fortran 77.
diff --git a/tests/f77demo/cprogram.c b/tests/f77demo/cprogram.c
index 3275fd5..1089e8c 100644
--- a/tests/f77demo/cprogram.c
+++ b/tests/f77demo/cprogram.c
@@ -28,26 +28,26 @@ int
main ()
{
int arg,cres,fres;
-
+
printf ("Welcome to GNU libtool mixed C/Fortran demo!\n");
-
+
arg=2;
-
+
cres=csub(arg);
-
+
printf ("The C subroutine returned, claiming that 2*%d = %d\n",arg,cres);
-
+
if(cres==2*arg)
printf ("The C subroutine is ok!\n");
-
+
printf("\nCalling the C wrapper routine...\n");
fres=fwrapper(arg);
-
+
printf ("The C wrapper to the fortran subroutine returned,\n"
"claiming that 2*%d = %d\n",arg,fres);
-
+
if(fres==2*arg)
printf ("The Fortran 77 subroutine is ok!\n");
-
+
return 0;
}
diff --git a/tests/f77demo/foof.f b/tests/f77demo/foof.f
index f899c49..6f6c6f6 100644
--- a/tests/f77demo/foof.f
+++ b/tests/f77demo/foof.f
@@ -1,9 +1,7 @@
-C
C This program is free software; you can redistribute it and/or
C modify it under the terms of the GNU General Public License
C as published by the Free Software Foundation; either version 2
C of the License, or (at your option) any later version.
-C
subroutine fsub(arg,res)
write(*,*) 'fsub called'
diff --git a/tests/f77demo/foof2.f b/tests/f77demo/foof2.f
index e1f1550..f7e2fe4 100644
--- a/tests/f77demo/foof2.f
+++ b/tests/f77demo/foof2.f
@@ -1,9 +1,7 @@
-C
C This program is free software; you can redistribute it and/or
C modify it under the terms of the GNU General Public License
C as published by the Free Software Foundation; either version 2
C of the License, or (at your option) any later version.
-C
subroutine fsubf(arg,res)
implicit none
diff --git a/tests/f77demo/foof3.f b/tests/f77demo/foof3.f
index 6d88204..8b7307f 100644
--- a/tests/f77demo/foof3.f
+++ b/tests/f77demo/foof3.f
@@ -1,9 +1,7 @@
-C
C This program is free software; you can redistribute it and/or
C modify it under the terms of the GNU General Public License
C as published by the Free Software Foundation; either version 2
C of the License, or (at your option) any later version.
-C
subroutine fsub3(arg,res)
implicit none
diff --git a/tests/f77demo/fprogram.f b/tests/f77demo/fprogram.f
index faf56a6..6fcdb75 100644
--- a/tests/f77demo/fprogram.f
+++ b/tests/f77demo/fprogram.f
@@ -1,9 +1,7 @@
-C
C This program is free software; you can redistribute it and/or
C modify it under the terms of the GNU General Public License
C as published by the Free Software Foundation; either version 2
C of the License, or (at your option) any later version.
-C
program fprogram
implicit none
diff --git a/tests/fcdemo/README b/tests/fcdemo/README
index 44214a0..c18cc97 100644
--- a/tests/fcdemo/README
+++ b/tests/fcdemo/README
@@ -1,12 +1,12 @@
This is a short demo of the fortran support in libtool.
-fprogram is a pure-fortran program which is linked
+fprogram is a pure-fortran program which is linked
against the fortran-only library libfoo.la
cprogram is a C program, which is linked against the
mixed C and fortran library libmix.la. The program
-calls a C function, which in turn calls a fortran
+calls a C function, which in turn calls a fortran
function.
-This demo requires GNU autoconf, automake,
+This demo requires GNU autoconf, automake,
libtool with the FC tag and quite obvious Fortran.
diff --git a/tests/fcdemo/cprogram.c b/tests/fcdemo/cprogram.c
index b0bdf12..e7818e0 100644
--- a/tests/fcdemo/cprogram.c
+++ b/tests/fcdemo/cprogram.c
@@ -29,26 +29,26 @@ int
main ()
{
int arg,cres,fres;
-
+
printf ("Welcome to GNU libtool mixed C/Fortran demo!\n");
-
+
arg = 2;
-
+
cres = csub (arg);
-
+
printf ("The C subroutine returned, claiming that 2*%d = %d\n",arg,cres);
-
+
if (cres == 2*arg)
printf ("The C subroutine is ok!\n");
-
+
printf ("\nCalling the C wrapper routine...\n");
fres = fwrapper (arg);
-
+
printf ("The C wrapper to the fortran subroutine returned,\n"
"claiming that 2*%d = %d\n",arg,fres);
-
+
if (fres == 2*arg)
printf ("The Fortran subroutine is ok!\n");
-
+
return 0;
}
diff --git a/tests/fcdemo/foof.f90 b/tests/fcdemo/foof.f90
index 794dde9..7877f21 100644
--- a/tests/fcdemo/foof.f90
+++ b/tests/fcdemo/foof.f90
@@ -1,9 +1,8 @@
-!
! This program is free software; you can redistribute it and/or
! modify it under the terms of the GNU General Public License
! as published by the Free Software Foundation; either version 2
! of the License, or (at your option) any later version.
-!
+
subroutine fsub(arg,res)
write(*,*) 'fsub called'
call fsubf(arg,res)
diff --git a/tests/fcdemo/foof2.f90 b/tests/fcdemo/foof2.f90
index 913868b..9917ee7 100644
--- a/tests/fcdemo/foof2.f90
+++ b/tests/fcdemo/foof2.f90
@@ -1,9 +1,8 @@
-!
! This program is free software; you can redistribute it and/or
! modify it under the terms of the GNU General Public License
! as published by the Free Software Foundation; either version 2
! of the License, or (at your option) any later version.
-!
+
subroutine fsubf(arg,res)
implicit none
integer arg,res
diff --git a/tests/fcdemo/foof3.f90 b/tests/fcdemo/foof3.f90
index 922751b..5de3c84 100644
--- a/tests/fcdemo/foof3.f90
+++ b/tests/fcdemo/foof3.f90
@@ -1,9 +1,8 @@
-!
! This program is free software; you can redistribute it and/or
! modify it under the terms of the GNU General Public License
! as published by the Free Software Foundation; either version 2
! of the License, or (at your option) any later version.
-!
+
subroutine fsub3(arg,res)
implicit none
integer arg,res
diff --git a/tests/fcdemo/fprogram.f90 b/tests/fcdemo/fprogram.f90
index dca35b8..4fa1500 100644
--- a/tests/fcdemo/fprogram.f90
+++ b/tests/fcdemo/fprogram.f90
@@ -1,9 +1,8 @@
-!
! This program is free software; you can redistribute it and/or
! modify it under the terms of the GNU General Public License
! as published by the Free Software Foundation; either version 2
! of the License, or (at your option) any later version.
-!
+
program fprogram
implicit none
integer arg,res
diff --git a/tests/mdemo/README b/tests/mdemo/README
index a599ff2..aa4cebb 100644
--- a/tests/mdemo/README
+++ b/tests/mdemo/README
@@ -1,10 +1,10 @@
This is mdemo, an example package that uses GNU libtool with an
-Automake-generated environment to build two simple modules and
+Automake-generated environment to build two simple modules and
a program.
It demonstrates how to build both dynamic and static libraries
that can be dlopened. mdemo uses libtool's portable dlopen
-wrapper called "libltdl".
+wrapper called "libltdl".
All exported symbols are prefixed with "libname_LTX_" to avoid
symbols conflicts, especially when linking statically.
libltdl will automatically cut the prefix off to get the real name.
diff --git a/tests/mdemo/main.c b/tests/mdemo/main.c
index 3a95664..ea732a9 100644
--- a/tests/mdemo/main.c
+++ b/tests/mdemo/main.c
@@ -34,7 +34,7 @@ LT_END_C_DECLS
int
test_dl (char *filename, int test_ext)
{
- lt_dlhandle handle;
+ lt_dlhandle handle;
const lt_dlinfo *info;
int (*pfoo1)() = 0;
int (*pfoo2)() = 0;
@@ -65,12 +65,12 @@ test_dl (char *filename, int test_ext)
}
printf ("module filename: %s\n", info->filename);
printf ("module reference count: %i\n", info->ref_count);
-
- phello = (int(*)())lt_dlsym(handle, "hello");
+
+ phello = (int(*)())lt_dlsym(handle, "hello");
if (phello)
{
int value = (*phello) ();
-
+
printf ("hello returned: %i\n", value);
if (value == HELLO_RET)
printf("hello is ok!\n");
@@ -82,7 +82,7 @@ test_dl (char *filename, int test_ext)
ret = 1;
}
- pnothing = (int*)lt_dlsym(handle, "nothing");
+ pnothing = (int*)lt_dlsym(handle, "nothing");
/* Try assigning to the nothing variable. */
if (pnothing)
*pnothing = 1;
@@ -93,7 +93,7 @@ test_dl (char *filename, int test_ext)
ret = 1;
}
- pfoo1 = (int(*)())lt_dlsym(handle, "foo1");
+ pfoo1 = (int(*)())lt_dlsym(handle, "foo1");
/* Just call the functions and check return values. */
if (pfoo1)
{
@@ -103,7 +103,7 @@ test_dl (char *filename, int test_ext)
ret = 1;
}
else {
- pfoo2 = (int(*)())lt_dlsym(handle, "foo2");
+ pfoo2 = (int(*)())lt_dlsym(handle, "foo2");
if (pfoo2)
{
if ((*pfoo2) () == FOO_RET)
@@ -132,7 +132,7 @@ int myvar;
int
test_dlself ()
{
- lt_dlhandle handle;
+ lt_dlhandle handle;
int (*pmyfunc)() = 0;
int *pmyvar = 0;
int ret = 0;
@@ -148,7 +148,7 @@ test_dlself ()
if (pmyfunc)
{
int value = (*pmyfunc) ();
-
+
printf ("myfunc returned: %i\n", value);
if (value == HELLO_RET)
printf("myfunc is ok!\n");
@@ -160,7 +160,7 @@ test_dlself ()
ret = 1;
}
- pmyvar = (int*)lt_dlsym(handle, "myvar");
+ pmyvar = (int*)lt_dlsym(handle, "myvar");
/* Try assigning to the variable. */
if (pmyvar)
*pmyvar = 1;
diff --git a/tests/mdemo/mlib.c b/tests/mdemo/mlib.c
index c16c35c..38374a4 100644
--- a/tests/mdemo/mlib.c
+++ b/tests/mdemo/mlib.c
@@ -30,7 +30,7 @@ or obtained by writing to the Free Software Foundation, Inc.,
int
test_dl (char *filename)
{
- lt_dlhandle handle;
+ lt_dlhandle handle;
const lt_dlinfo *info;
int (*pfoo1)() = 0;
int (*pfoo2)() = 0;
@@ -57,12 +57,12 @@ test_dl (char *filename)
}
printf ("module filename: %s\n", info->filename);
printf ("module reference count: %i\n", info->ref_count);
-
- phello = (int(*)())lt_dlsym(handle, "hello");
+
+ phello = (int(*)())lt_dlsym(handle, "hello");
if (phello)
{
int value = (*phello) ();
-
+
printf ("hello returned: %i\n", value);
if (value == HELLO_RET)
printf("hello is ok!\n");
@@ -74,7 +74,7 @@ test_dl (char *filename)
ret = 1;
}
- pnothing = (int*)lt_dlsym(handle, "nothing");
+ pnothing = (int*)lt_dlsym(handle, "nothing");
/* Try assigning to the nothing variable. */
if (pnothing)
*pnothing = 1;
@@ -85,7 +85,7 @@ test_dl (char *filename)
ret = 1;
}
- pfoo1 = (int(*)())lt_dlsym(handle, "foo1");
+ pfoo1 = (int(*)())lt_dlsym(handle, "foo1");
/* Just call the functions and check return values. */
if (pfoo1)
{
@@ -95,7 +95,7 @@ test_dl (char *filename)
ret = 1;
}
else {
- pfoo2 = (int(*)())lt_dlsym(handle, "foo2");
+ pfoo2 = (int(*)())lt_dlsym(handle, "foo2");
if (pfoo2)
{
if ((*pfoo2) () == FOO_RET)
@@ -113,7 +113,7 @@ test_dl (char *filename)
return ret;
}
-int
+int
mlib_func (int argc, char **argv)
{
int ret = 0;
diff --git a/tests/objectlist.test b/tests/objectlist.test
index 0506340..0eec0f3 100755
--- a/tests/objectlist.test
+++ b/tests/objectlist.test
@@ -43,6 +43,6 @@ rm -f "$objlist"
echo "$linkresult" | ${EGREP} "spaces" >/dev/null 2>&1 && {
func_msg "$progname: -objectlist with spaces in filename not recognized."
exit $EXIT_FAILURE
-}
+}
exit $EXIT_SUCCESS
diff --git a/tests/static.at b/tests/static.at
index 6072d77..5b779e6 100644
--- a/tests/static.at
+++ b/tests/static.at
@@ -37,9 +37,9 @@
# will only cause the linker not to consider `*.so' libraries, but only
# `*.a'. The latter, however, may still be shared images. :-/
# `-all-static' still works, however.
-#
+#
# It will not work with dlpreloading until we fix its related bug.
-#
+#
# Let's try the latter until we know better.
# - Test -Bstatic/-Bdynamic. It should work with all of:
@@ -248,7 +248,7 @@ for withdep in no yes; do
$LIBTOOL --mode=install cp a1/liba1.la $libdir1/liba1.la
$LIBTOOL --mode=install cp a3/liba3.la $libdir3/liba3.la
$LIBTOOL --mode=clean rm -f a1/liba1.la a3/liba3.la
- test "$withdep" = yes && $LIBTOOL --mode=clean rm -f a1/liba1dep.la
+ test "$withdep" = yes && $LIBTOOL --mode=clean rm -f a1/liba1dep.la
# simulate a non-libtool lib:
rm -f $libdir3/liba3.la
@@ -307,7 +307,7 @@ for withdep in no yes; do
### install the programs.
# We can't install any program that links dynamically against liba2.
- for st in -static -static-libtool-libs $can_link_all_static `$per_deplib &&
echo 2 12 23 123 123a`; do
+ for st in -static -static-libtool-libs $can_link_all_static `$per_deplib &&
echo 2 12 23 123 123a`; do
echo "# m$st"
AT_CHECK([$LIBTOOL --mode=install cp m${st}$EXEEXT $bindir/m${st}$EXEEXT],
[0], [ignore], [stderr])
if $have_static; then
@@ -318,7 +318,7 @@ for withdep in no yes; do
### Run each program once so that relinking has happened.
-
+
func_fix_path $prefix1 $prefix2 $prefix3
func_test_exec -static -static-libtool-libs -all-static `$per_deplib && echo
1 2 3 12 13 23 31 123 123a`
func_restore_path
diff --git a/tests/template.at b/tests/template.at
index 74e1cfd..4a549da 100644
--- a/tests/template.at
+++ b/tests/template.at
@@ -129,7 +129,7 @@ AT_KEYWORDS([libtool])
noskip=:
# Mac OS X.
-# The linker has issues with this test.
+# The linker has issues with this test.
case $host in
*-darwin*) noskip=false ;;
esac
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 7ada425..0c2ffcf 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -442,7 +442,7 @@ module.lo: $(LIBTOOL) module.c
$(LTCOMPILE) -c module.c
]])
cat >> Makefile <<EOF
-SHELL = $SHELL
+SHELL = $SHELL
EOF
])
m4_popdef([_ARG_DIR])
--
1.7.7.3
Cheers,
--
Gary V. Vaughan (gary AT gnu DOT org)
- Re: [PATCH 22/25] syntax-check: enable sc_bindtextdomain., (continued)
[PATCH 24/25] syntax-check: enable sc_prohibit_always_true_header_tests., Gary V. Vaughan, 2011/11/15
[PATCH 25/25] dist: hook syntax-check into `make distcheck'., Gary V. Vaughan, 2011/11/15
[PATCH 21/25] syntax-check: fix violations and implement sc_trailing_blank-non-rfc3676.,
Gary V. Vaughan <=