From b801b453af6de75838c3298137628f05e94ffb48 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 23 Sep 2018 22:24:02 +0000 Subject: whitespace fixes - replace tabs with spaces where possible - remove line ending spaces - remove double/triple newlines at EOF - fix a non-UTF-8 character - cleanup a few indentations/line continuations in manual examples Closes https://github.com/curl/curl/pull/3037 --- tests/certs/EdelCurlRoot-ca.prm | 1 - tests/certs/scripts/Makefile.am | 1 - tests/certs/scripts/genroot.sh | 18 ++++++++--------- tests/certs/scripts/genserv.sh | 44 ++++++++++++++++++++--------------------- tests/data/DISABLED | 1 - tests/data/test1020 | 1 - tests/data/test1408 | 1 - tests/data/test567 | 1 - tests/data/test568 | 1 - tests/data/test569 | 1 - tests/data/test570 | 1 - tests/data/test571 | 1 - tests/data/test572 | 1 - tests/fuzz/download_fuzzer.sh | 1 - tests/keywords.pl | 2 +- tests/libtest/Makefile.am | 4 ++-- tests/libtest/lib1507.c | 2 -- tests/libtest/lib1512.c | 1 - tests/libtest/lib1520.c | 2 -- tests/libtest/lib1526.c | 1 - tests/libtest/lib1531.c | 1 - tests/libtest/lib1533.c | 1 - tests/libtest/lib500.c | 1 - tests/libtest/lib501.c | 1 - tests/libtest/lib502.c | 1 - tests/libtest/lib503.c | 1 - tests/libtest/lib504.c | 1 - tests/libtest/lib506.c | 1 - tests/libtest/lib509.c | 1 - tests/libtest/lib512.c | 1 - tests/libtest/lib519.c | 1 - tests/libtest/lib521.c | 1 - tests/libtest/lib523.c | 1 - tests/libtest/lib524.c | 1 - tests/libtest/lib547.c | 1 - tests/libtest/lib549.c | 1 - tests/libtest/lib555.c | 1 - tests/libtest/lib556.c | 1 - tests/libtest/lib558.c | 1 - tests/libtest/lib559.c | 1 - tests/libtest/lib566.c | 1 - tests/libtest/lib567.c | 1 - tests/libtest/lib568.c | 1 - tests/libtest/lib569.c | 1 - tests/libtest/lib570.c | 1 - tests/libtest/lib571.c | 1 - tests/libtest/lib572.c | 1 - tests/libtest/lib573.c | 1 - tests/libtest/lib586.c | 1 - tests/libtest/lib590.c | 1 - tests/libtest/lib598.c | 1 - tests/libtest/libauthretry.c | 1 - tests/libtest/sethostname.h | 1 - tests/libtest/stub_gssapi.h | 1 - tests/libtest/testtrace.c | 1 - tests/libtest/testtrace.h | 1 - tests/libtest/testutil.h | 1 - tests/pathhelp.pm | 6 +++--- tests/server/CMakeLists.txt | 1 - tests/server/rtspd.c | 1 - tests/server/sockfilt.c | 1 - tests/server/sws.c | 1 - tests/server/testpart.c | 1 - tests/serverhelp.pm | 1 - tests/sshhelp.pm | 1 - tests/unit/Makefile.inc | 6 +++--- tests/unit/curlcheck.h | 1 - 67 files changed, 39 insertions(+), 104 deletions(-) (limited to 'tests') diff --git a/tests/certs/EdelCurlRoot-ca.prm b/tests/certs/EdelCurlRoot-ca.prm index d0eff4894..2e8104730 100644 --- a/tests/certs/EdelCurlRoot-ca.prm +++ b/tests/certs/EdelCurlRoot-ca.prm @@ -15,4 +15,3 @@ commonName_value = Northern Nowhere Trust Anchor basicConstraints = critical,CA:true keyUsage = critical,keyCertSign,cRLSign subjectKeyIdentifier = hash - diff --git a/tests/certs/scripts/Makefile.am b/tests/certs/scripts/Makefile.am index db4a90f54..1db622204 100644 --- a/tests/certs/scripts/Makefile.am +++ b/tests/certs/scripts/Makefile.am @@ -26,4 +26,3 @@ SCRIPTFILES = \ genserv.sh EXTRA_DIST = $(SCRIPTFILES) - diff --git a/tests/certs/scripts/genroot.sh b/tests/certs/scripts/genroot.sh index 5dd9fac95..f66fc6554 100755 --- a/tests/certs/scripts/genroot.sh +++ b/tests/certs/scripts/genroot.sh @@ -22,19 +22,19 @@ DIGESTALGO=-sha256 PREFIX=$1 if [ ".$PREFIX" = . ] ; then - echo No configuration prefix - NOTOK=1 + echo No configuration prefix + NOTOK=1 else - if [ ! -f $PREFIX-ca.prm ] ; then - echo No configuration file $PREFIX-ca.prm - NOTOK=1 - fi + if [ ! -f $PREFIX-ca.prm ] ; then + echo No configuration file $PREFIX-ca.prm + NOTOK=1 + fi fi if [ ".$NOTOK" != . ] ; then - echo "Sorry, I can't do that for you." - $USAGE - exit + echo "Sorry, I can't do that for you." + $USAGE + exit fi GETSERIAL="\$t = time ;\$d = \$t . substr(\$t+$$ ,-4,4)-1;print \$d" diff --git a/tests/certs/scripts/genserv.sh b/tests/certs/scripts/genserv.sh index 99f44ccee..f0f440320 100755 --- a/tests/certs/scripts/genserv.sh +++ b/tests/certs/scripts/genserv.sh @@ -26,39 +26,39 @@ DHP=NO PREFIX=$1 if [ ".$PREFIX" = . ] ; then - echo No configuration prefix - NOTOK=1 + echo No configuration prefix + NOTOK=1 else - if [ ! -f $PREFIX-sv.prm ] ; then - echo No configuration file $PREFIX-sv.prm - NOTOK=1 - fi + if [ ! -f $PREFIX-sv.prm ] ; then + echo No configuration file $PREFIX-sv.prm + NOTOK=1 + fi fi CAPREFIX=$2 if [ ".$CAPREFIX" = . ] ; then - echo No CA prefix - NOTOK=1 + echo No CA prefix + NOTOK=1 else - if [ ! -f $CAPREFIX-ca.cacert ] ; then - echo No CA certificate file $CAPREFIX-ca.caert - NOTOK=1 - fi - if [ ! -f $CAPREFIX-ca.key ] ; then - echo No $CAPREFIX key - NOTOK=1 - fi + if [ ! -f $CAPREFIX-ca.cacert ] ; then + echo No CA certificate file $CAPREFIX-ca.caert + NOTOK=1 + fi + if [ ! -f $CAPREFIX-ca.key ] ; then + echo No $CAPREFIX key + NOTOK=1 + fi fi if [ ".$NOTOK" != . ] ; then - echo "Sorry, I can't do that for you." - $USAGE - exit + echo "Sorry, I can't do that for you." + $USAGE + exit fi if [ ".$SERIAL" = . ] ; then - GETSERIAL="\$t = time ;\$d = \$t . substr(\$t+$$ ,-4,4)-1;print \$d" - SERIAL=`/usr/bin/env perl -e "$GETSERIAL"` + GETSERIAL="\$t = time ;\$d = \$t . substr(\$t+$$ ,-4,4)-1;print \$d" + SERIAL=`/usr/bin/env perl -e "$GETSERIAL"` fi echo SERIAL=$SERIAL PREFIX=$PREFIX CAPREFIX=$CAPREFIX DURATION=$DURATION KEYSIZE=$KEYSIZE @@ -116,5 +116,3 @@ cat $PREFIX-sv.prm $PREFIX-sv.key $PREFIX-sv.crt $PREFIX-sv.dhp >$PREFIX-sv.pem chmod o-r $PREFIX-sv.prm echo "$PREFIX-sv.pem done" - - diff --git a/tests/data/DISABLED b/tests/data/DISABLED index 0fb5b92e5..61bdf1351 100644 --- a/tests/data/DISABLED +++ b/tests/data/DISABLED @@ -28,4 +28,3 @@ 1901 1902 2033 - diff --git a/tests/data/test1020 b/tests/data/test1020 index 735871d6b..61032fb17 100644 --- a/tests/data/test1020 +++ b/tests/data/test1020 @@ -39,4 +39,3 @@ file - diff --git a/tests/data/test1408 b/tests/data/test1408 index 54d5e7778..bf775ed39 100644 --- a/tests/data/test1408 +++ b/tests/data/test1408 @@ -71,4 +71,3 @@ Cookie: time=1 - diff --git a/tests/data/test567 b/tests/data/test567 index de0f63273..4f91c85f0 100644 --- a/tests/data/test567 +++ b/tests/data/test567 @@ -47,4 +47,3 @@ Test-Number: 567 - diff --git a/tests/data/test568 b/tests/data/test568 index 09fa81ce2..372866dca 100644 --- a/tests/data/test568 +++ b/tests/data/test568 @@ -114,4 +114,3 @@ CSeq: 4 - diff --git a/tests/data/test569 b/tests/data/test569 index ea6cd0bb0..924832c11 100644 --- a/tests/data/test569 +++ b/tests/data/test569 @@ -108,4 +108,3 @@ Got Session ID: [A] - diff --git a/tests/data/test570 b/tests/data/test570 index 65f32a5be..431c79afc 100644 --- a/tests/data/test570 +++ b/tests/data/test570 @@ -74,4 +74,3 @@ Session: asdf - diff --git a/tests/data/test571 b/tests/data/test571 index 494ac416b..842410ad6 100644 --- a/tests/data/test571 +++ b/tests/data/test571 @@ -105,4 +105,3 @@ $99 - diff --git a/tests/data/test572 b/tests/data/test572 index 903ded967..7f044478d 100644 --- a/tests/data/test572 +++ b/tests/data/test572 @@ -119,4 +119,3 @@ Session: getparams-test - diff --git a/tests/fuzz/download_fuzzer.sh b/tests/fuzz/download_fuzzer.sh index 28228e004..8c70b56e1 100755 --- a/tests/fuzz/download_fuzzer.sh +++ b/tests/fuzz/download_fuzzer.sh @@ -5,4 +5,3 @@ set -ex # Clone the curl-fuzzer repository to the specified directory. git clone http://github.com/curl/curl-fuzzer $1 - diff --git a/tests/keywords.pl b/tests/keywords.pl index 33748bd37..7ab907fe3 100755 --- a/tests/keywords.pl +++ b/tests/keywords.pl @@ -120,7 +120,7 @@ sub show { return $ret; } -# sort alphabetically +# sort alphabetically my @mtest = reverse sort { lc($b) cmp lc($a) } keys %k; print <nohex); return 0; } - diff --git a/tests/libtest/testtrace.h b/tests/libtest/testtrace.h index fafdf2992..a09ce348f 100644 --- a/tests/libtest/testtrace.h +++ b/tests/libtest/testtrace.h @@ -34,4 +34,3 @@ int libtest_debug_cb(CURL *handle, curl_infotype type, void *userp); #endif /* HEADER_LIBTEST_TESTTRACE_H */ - diff --git a/tests/libtest/testutil.h b/tests/libtest/testutil.h index f2aeae642..6c063ea57 100644 --- a/tests/libtest/testutil.h +++ b/tests/libtest/testutil.h @@ -42,4 +42,3 @@ double tutil_tvdiff_secs(struct timeval t1, struct timeval t2); #endif /* HEADER_CURL_LIBTEST_TESTUTIL_H */ - diff --git a/tests/pathhelp.pm b/tests/pathhelp.pm index bd91c91bf..3a413b22e 100644 --- a/tests/pathhelp.pm +++ b/tests/pathhelp.pm @@ -181,7 +181,7 @@ sub get_win32_current_drive { sub do_msys_transform; # Internal function. Gets two parameters: first parameter must be single -# drive letter ('c'), second optional parameter is path relative to drive's +# drive letter ('c'), second optional parameter is path relative to drive's # current working directory. Returns Win32 absolute normalized path. sub get_abs_path_on_win32_drive; @@ -455,7 +455,7 @@ sub build_sys_abs_path { my $has_final_slash = ($path =~ m{[\\/]$}); - # Resolve relative directories, as they may be not resolved for + # Resolve relative directories, as they may be not resolved for # Unix-style paths. # Remove duplicated slashes, as they may be not processed. $path = normalize_path($path); @@ -624,7 +624,7 @@ sub do_msys_transform { } # Internal function. Gets two parameters: first parameter must be single -# drive letter ('c'), second optional parameter is path relative to drive's +# drive letter ('c'), second optional parameter is path relative to drive's # current working directory. Returns Win32 absolute normalized path. sub get_abs_path_on_win32_drive { my ($drv, $rel_path) = @_; diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt index 9d2a43164..78b9b7029 100644 --- a/tests/server/CMakeLists.txt +++ b/tests/server/CMakeLists.txt @@ -57,4 +57,3 @@ endforeach() # SETUP_EXECUTABLE(sockfilt sockfilt.c util.c util.h ${useful} ${CURL_SOURCE_DIR}/lib/inet_pton.c) # SETUP_EXECUTABLE(getpart testpart.c ${useful}) # SETUP_EXECUTABLE(tftpd tftpd.c util.c util.h ${useful} tftp.h) - diff --git a/tests/server/rtspd.c b/tests/server/rtspd.c index 4519eab60..0629d8a53 100644 --- a/tests/server/rtspd.c +++ b/tests/server/rtspd.c @@ -1481,4 +1481,3 @@ server_cleanup: logmsg("========> rtspd quits"); return 0; } - diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c index 10a16ef00..86a1ff52d 100644 --- a/tests/server/sockfilt.c +++ b/tests/server/sockfilt.c @@ -1563,4 +1563,3 @@ sockfilt_cleanup: logmsg("============> sockfilt quits"); return 0; } - diff --git a/tests/server/sws.c b/tests/server/sws.c index fbe7761d8..8df4d76e4 100644 --- a/tests/server/sws.c +++ b/tests/server/sws.c @@ -2425,4 +2425,3 @@ sws_cleanup: logmsg("========> sws quits"); return 0; } - diff --git a/tests/server/testpart.c b/tests/server/testpart.c index 77f148640..7d31e5183 100644 --- a/tests/server/testpart.c +++ b/tests/server/testpart.c @@ -47,4 +47,3 @@ int main(int argc, char **argv) } return 0; } - diff --git a/tests/serverhelp.pm b/tests/serverhelp.pm index a83a12584..7c9808c82 100644 --- a/tests/serverhelp.pm +++ b/tests/serverhelp.pm @@ -244,4 +244,3 @@ sub datasockf_logfilename { #*************************************************************************** # End of library 1; - diff --git a/tests/sshhelp.pm b/tests/sshhelp.pm index c5618a109..7345eb300 100644 --- a/tests/sshhelp.pm +++ b/tests/sshhelp.pm @@ -451,4 +451,3 @@ sub sshversioninfo { #*************************************************************************** # End of library 1; - diff --git a/tests/unit/Makefile.inc b/tests/unit/Makefile.inc index 5811ab476..141950c80 100644 --- a/tests/unit/Makefile.inc +++ b/tests/unit/Makefile.inc @@ -5,10 +5,10 @@ UNITFILES = curlcheck.h \ ../libtest/first.c # These are all unit test programs -UNITPROGS = unit1300 unit1301 unit1302 unit1303 unit1304 unit1305 unit1307 \ +UNITPROGS = unit1300 unit1301 unit1302 unit1303 unit1304 unit1305 unit1307 \ unit1308 unit1309 unit1323 \ - unit1330 unit1394 unit1395 unit1396 unit1397 unit1398 \ - unit1399 \ + unit1330 unit1394 unit1395 unit1396 unit1397 unit1398 \ + unit1399 \ unit1600 unit1601 unit1602 unit1603 unit1604 unit1605 unit1606 unit1607 \ unit1608 unit1609 unit1620 \ unit1650 diff --git a/tests/unit/curlcheck.h b/tests/unit/curlcheck.h index 46cb84aaf..c358afa6e 100644 --- a/tests/unit/curlcheck.h +++ b/tests/unit/curlcheck.h @@ -99,4 +99,3 @@ unit_test_abort: \ } \ return unitfail; \ } - -- cgit v1.2.3