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
author: Viktor Szakats <commit@vszakats.net> 2018-09-23 22:24:02 +0000
committer: Viktor Szakats <commit@vszakats.net> 2018-09-23 22:24:02 +0000
commit: b801b453af6de75838c3298137628f05e94ffb48 (patch)
tree: 77dd34603bdf79dc248eb180849aec0aec9d2421
parent: e407e79c2937b6710ac823f64f36ac0c622f33ce (diff)
download: curl-b801b453af6de75838c3298137628f05e94ffb48.tar.gz
231 files changed, 772 insertions, 983 deletions
diff --git a/CMake/CMakeConfigurableFile.in b/CMake/CMakeConfigurableFile.in
index 4cf74a12b..df2c382e9 100644
--- a/CMake/CMakeConfigurableFile.in
+++ b/CMake/CMakeConfigurableFile.in
@@ -1,2 +1 @@
 @CMAKE_CONFIGURABLE_FILE_CONTENT@
-
diff --git a/Makefile.am b/Makefile.am
index 959eeb531..dd93a383e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -151,18 +151,18 @@ VC_DIST = projects/README                           \
  projects/wolfssl_options.h                         \
  projects/wolfssl_override.props
 
-WINBUILD_DIST = winbuild/BUILD.WINDOWS.txt winbuild/gen_resp_file.bat	\
+WINBUILD_DIST = winbuild/BUILD.WINDOWS.txt winbuild/gen_resp_file.bat \
  winbuild/MakefileBuild.vc winbuild/Makefile.vc
 
-EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist curl-config.in	\
- RELEASE-NOTES buildconf libcurl.pc.in MacOSX-Framework scripts/zsh.pl	\
- scripts/updatemanpages.pl $(CMAKE_DIST) $(VC_DIST) $(WINBUILD_DIST)	\
+EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist curl-config.in \
+ RELEASE-NOTES buildconf libcurl.pc.in MacOSX-Framework scripts/zsh.pl \
+ scripts/updatemanpages.pl $(CMAKE_DIST) $(VC_DIST) $(WINBUILD_DIST) \
  lib/libcurl.vers.in buildconf.bat scripts/coverage.sh
 
-CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) $(VC7_LIBVCPROJ) $(VC7_SRCVCPROJ)	\
- $(VC71_LIBVCPROJ) $(VC71_SRCVCPROJ) $(VC8_LIBVCPROJ) $(VC8_SRCVCPROJ)	\
- $(VC9_LIBVCPROJ) $(VC9_SRCVCPROJ) $(VC10_LIBVCXPROJ) $(VC10_SRCVCXPROJ)	\
- $(VC11_LIBVCXPROJ) $(VC11_SRCVCXPROJ) $(VC12_LIBVCXPROJ) $(VC12_SRCVCXPROJ)	\
+CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) $(VC7_LIBVCPROJ) $(VC7_SRCVCPROJ) \
+ $(VC71_LIBVCPROJ) $(VC71_SRCVCPROJ) $(VC8_LIBVCPROJ) $(VC8_SRCVCPROJ) \
+ $(VC9_LIBVCPROJ) $(VC9_SRCVCPROJ) $(VC10_LIBVCXPROJ) $(VC10_SRCVCXPROJ) \
+ $(VC11_LIBVCXPROJ) $(VC11_SRCVCXPROJ) $(VC12_LIBVCXPROJ) $(VC12_SRCVCXPROJ) \
  $(VC14_LIBVCXPROJ) $(VC14_SRCVCXPROJ) $(VC15_LIBVCXPROJ) $(VC15_SRCVCXPROJ)
 
 bin_SCRIPTS = curl-config
@@ -305,12 +305,12 @@ checksrc:
 
 .PHONY: vc-ide
 
-vc-ide: $(VC6_LIBDSP_DEPS) $(VC6_SRCDSP_DEPS) $(VC7_LIBVCPROJ_DEPS)	\
- $(VC7_SRCVCPROJ_DEPS) $(VC71_LIBVCPROJ_DEPS) $(VC71_SRCVCPROJ_DEPS)	\
- $(VC8_LIBVCPROJ_DEPS) $(VC8_SRCVCPROJ_DEPS) $(VC9_LIBVCPROJ_DEPS)	\
- $(VC9_SRCVCPROJ_DEPS) $(VC10_LIBVCXPROJ_DEPS) $(VC10_SRCVCXPROJ_DEPS)	\
- $(VC11_LIBVCXPROJ_DEPS) $(VC11_SRCVCXPROJ_DEPS) $(VC12_LIBVCXPROJ_DEPS)	\
- $(VC12_SRCVCXPROJ_DEPS) $(VC14_LIBVCXPROJ_DEPS) $(VC14_SRCVCXPROJ_DEPS)	\
+vc-ide: $(VC6_LIBDSP_DEPS) $(VC6_SRCDSP_DEPS) $(VC7_LIBVCPROJ_DEPS) \
+ $(VC7_SRCVCPROJ_DEPS) $(VC71_LIBVCPROJ_DEPS) $(VC71_SRCVCPROJ_DEPS) \
+ $(VC8_LIBVCPROJ_DEPS) $(VC8_SRCVCPROJ_DEPS) $(VC9_LIBVCPROJ_DEPS) \
+ $(VC9_SRCVCPROJ_DEPS) $(VC10_LIBVCXPROJ_DEPS) $(VC10_SRCVCXPROJ_DEPS) \
+ $(VC11_LIBVCXPROJ_DEPS) $(VC11_SRCVCXPROJ_DEPS) $(VC12_LIBVCXPROJ_DEPS) \
+ $(VC12_SRCVCXPROJ_DEPS) $(VC14_LIBVCXPROJ_DEPS) $(VC14_SRCVCXPROJ_DEPS) \
  $(VC15_LIBVCXPROJ_DEPS) $(VC15_SRCVCXPROJ_DEPS)
 	@(win32_lib_srcs='$(LIB_CFILES)'; \
 	win32_lib_hdrs='$(LIB_HFILES) config-win32.h'; \
diff --git a/README.md b/README.md
index d5f7a6347..f48ad762d 100644
--- a/README.md
+++ b/README.md
@@ -77,5 +77,3 @@ sponsor](https://opencollective.com/curl#sponsor)]
 <a href="https://opencollective.com/curl/sponsor/7/website" target="_blank"><img src="https://opencollective.com/curl/sponsor/7/avatar.svg"></a>
 <a href="https://opencollective.com/curl/sponsor/8/website" target="_blank"><img src="https://opencollective.com/curl/sponsor/8/avatar.svg"></a>
 <a href="https://opencollective.com/curl/sponsor/9/website" target="_blank"><img src="https://opencollective.com/curl/sponsor/9/avatar.svg"></a>
-
-
diff --git a/buildconf.bat b/buildconf.bat
index da5c0391a..a6bded34b 100644
--- a/buildconf.bat
+++ b/buildconf.bat
@@ -93,7 +93,7 @@ rem
 rem Returns:
 rem
 rem 0 - success
-rem 1 - success with simplified tool_hugehelp.c 
+rem 1 - success with simplified tool_hugehelp.c
 rem 2 - failed to generate Makefile
 rem 3 - failed to generate tool_hugehelp.c
 rem
@@ -193,7 +193,7 @@ rem
 
   if defined ROFFCMD (
     echo #include "tool_setup.h"> src\tool_hugehelp.c
-    echo #include "tool_hugehelp.h">> src\tool_hugehelp.c 
+    echo #include "tool_hugehelp.h">> src\tool_hugehelp.c
 
     if defined HAVE_GZIP (
       echo #ifndef HAVE_LIBZ>> src\tool_hugehelp.c
diff --git a/docs/DEPRECATE.md b/docs/DEPRECATE.md
index 73ae92ffd..3323633d8 100644
--- a/docs/DEPRECATE.md
+++ b/docs/DEPRECATE.md
@@ -90,4 +90,3 @@ revert if need be.
 
 Remove all global-cache related code from curl around April 2019 (might be
 7.66.0).
-
diff --git a/docs/INSTALL.cmake b/docs/INSTALL.cmake
index 0a8e43971..03328cbcd 100644
--- a/docs/INSTALL.cmake
+++ b/docs/INSTALL.cmake
@@ -88,4 +88,3 @@ cmake-gui
         GUI.  Once you have selected all the options you want, click the
         "Generate" button.
         6. Run the native build tool that you used CMake to generate.
-
diff --git a/docs/MANUAL b/docs/MANUAL
index 5df37e44a..280f1226d 100644
--- a/docs/MANUAL
+++ b/docs/MANUAL
@@ -178,8 +178,8 @@ PROXY
  options:
 
    curl -u "Remote-FTP-Username@remote.ftp.server Proxy-Username:Remote-Pass" \
-    --ftp-account Proxy-Password --upload-file local-file \
-    ftp://my-ftp.proxy.server:21/remote/upload/path/
+        --ftp-account Proxy-Password --upload-file local-file \
+        ftp://my-ftp.proxy.server:21/remote/upload/path/
 
  See the manual for your FTP proxy to determine the form it expects to set up
  transfers, and curl's -v option to see exactly what curl is sending.
@@ -234,8 +234,8 @@ UPLOADING
 
 SMB / SMBS
 
-        curl -T file.txt -u "domain\username:passwd" 
-         smb://server.example.com/share/
+        curl -T file.txt -u "domain\username:passwd" \
+             smb://server.example.com/share/
 
  HTTP
 
@@ -294,7 +294,7 @@ POST (HTTP)
   Post a simple "name" and "phone" guestbook.
 
         curl -d "name=Rafael%20Sagula&phone=3320780" \
-                http://www.where.com/guest.cgi
+             http://www.where.com/guest.cgi
 
   How to post a form with curl, lesson #1:
 
@@ -326,8 +326,8 @@ POST (HTTP)
 
   To post to this, you enter a curl command line like:
 
-        curl -d "user=foobar&pass=12345&id=blablabla&ding=submit"  (continues)
-          http://www.formpost.com/getthis/post.cgi
+        curl -d "user=foobar&pass=12345&id=blablabla&ding=submit" \
+             http://www.formpost.com/getthis/post.cgi
 
 
   While -d uses the application/x-www-form-urlencoded mime-type, generally
@@ -342,7 +342,7 @@ POST (HTTP)
   with different content types using the following syntax:
 
         curl -F "coolfiles=@fil1.gif;type=image/gif,fil2.txt,fil3.html" \
-        http://www.post.com/postit.cgi
+             http://www.post.com/postit.cgi
 
   If the content-type is not specified, curl will try to guess from the file
   extension (it only knows a few), or use the previously specified type (from
@@ -839,7 +839,7 @@ LDAP
       curl "ldap://user:passwd@ldap.frontec.se/o=frontec??sub?mail=*"
 
   By default, if user and password provided, OpenLDAP/WinLDAP will use basic
-  authentication. On Windows you can control this behavior by providing 
+  authentication. On Windows you can control this behavior by providing
   one of --basic, --ntlm or --digest option in curl command line
 
       curl --ntlm "ldap://user:passwd@ldap.frontec.se/o=frontec??sub?mail=*"
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 3c0296784..0183f1af5 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -116,4 +116,3 @@ pdf: $(PDFPAGES)
 
 distclean:
 	rm -f $(CLEANFILES)
-
diff --git a/docs/README.netware b/docs/README.netware
index 9028963f6..e6e1e0002 100644
--- a/docs/README.netware
+++ b/docs/README.netware
@@ -22,5 +22,3 @@ README.netware
         curl -M >manual.txt
 
   Read the INSTALL file for instructions on how to compile curl self.
-
-
diff --git a/docs/README.win32 b/docs/README.win32
index 00ca197fe..ca34dd162 100644
--- a/docs/README.win32
+++ b/docs/README.win32
@@ -21,5 +21,3 @@ README.win32
         curl -M >manual.txt
 
   Read the INSTALL file for instructions on how to compile curl self.
-
-
diff --git a/docs/TheArtOfHttpScripting b/docs/TheArtOfHttpScripting
index b2bd9db7a..c5b67ca1b 100644
--- a/docs/TheArtOfHttpScripting
+++ b/docs/TheArtOfHttpScripting
@@ -150,7 +150,7 @@ The Art Of Scripting HTTP Requests Using Curl
  --resolve option:
 
       curl --resolve www.example.org:80:127.0.0.1 http://www.example.org/
- 
+
  2.3 Port number
 
  Each protocol curl supports operates on a default port number, be it over TCP
diff --git a/docs/cmdline-opts/gen.pl b/docs/cmdline-opts/gen.pl
index dd990caf0..439b76585 100755
--- a/docs/cmdline-opts/gen.pl
+++ b/docs/cmdline-opts/gen.pl
@@ -388,4 +388,3 @@ sub getargs {
 indexoptions();
 
 getargs();
-
diff --git a/docs/cmdline-opts/metalink.d b/docs/cmdline-opts/metalink.d
index 8047e9f51..81fc8bc78 100644
--- a/docs/cmdline-opts/metalink.d
+++ b/docs/cmdline-opts/metalink.d
@@ -24,4 +24,3 @@ Metalink file at the time of this writing. Also note that if --metalink and
 including headers in the response will break Metalink parser and if the
 headers are included in the file described in Metalink file, hash check will
 fail.
-
diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am
index e5ed222ef..ce2e924d7 100644
--- a/docs/examples/Makefile.am
+++ b/docs/examples/Makefile.am
@@ -23,7 +23,7 @@
 AUTOMAKE_OPTIONS = foreign nostdinc
 
 EXTRA_DIST = README Makefile.example Makefile.inc Makefile.m32 \
-	Makefile.netware makefile.dj $(COMPLICATED_EXAMPLES)
+  Makefile.netware makefile.dj $(COMPLICATED_EXAMPLES)
 
 # Specify our include paths here, and do it relative to $(top_srcdir) and
 # $(top_builddir), to ensure that these paths which belong to the library
diff --git a/docs/examples/Makefile.netware b/docs/examples/Makefile.netware
index 8aca32558..9b6c69b8f 100644
--- a/docs/examples/Makefile.netware
+++ b/docs/examples/Makefile.netware
@@ -9,7 +9,7 @@
 
 # Edit the path below to point to the base of your Novell NDK.
 ifndef NDKBASE
-NDKBASE	= c:/novell
+NDKBASE = c:/novell
 endif
 
 # Edit the path below to point to the base of your Zlib sources.
@@ -53,17 +53,17 @@ LIBCARES_PATH = ../../ares
 endif
 
 ifndef INSTDIR
-INSTDIR	= ..$(DS)..$(DS)curl-$(LIBCURL_VERSION_STR)-bin-nw
+INSTDIR = ..$(DS)..$(DS)curl-$(LIBCURL_VERSION_STR)-bin-nw
 endif
 
 # Edit the vars below to change NLM target settings.
 TARGET  = examples
-VERSION	= $(LIBCURL_VERSION)
-COPYR	= Copyright (C) $(LIBCURL_COPYRIGHT_STR)
-DESCR	= curl ($(LIBARCH))
-MTSAFE	= YES
-STACK	= 8192
-SCREEN	= Example Program
+VERSION = $(LIBCURL_VERSION)
+COPYR   = Copyright (C) $(LIBCURL_COPYRIGHT_STR)
+DESCR   = curl ($(LIBARCH))
+MTSAFE  = YES
+STACK   = 8192
+SCREEN  = Example Program
 # Comment the line below if you don't want to load protected automatically.
 # LDRING = 3
 
@@ -77,39 +77,39 @@ endif
 
 # must be equal to NDEBUG or DEBUG, CURLDEBUG
 ifndef DB
-DB	= NDEBUG
+DB = NDEBUG
 endif
 # Optimization: -O<n> or debugging: -g
 ifeq ($(DB),NDEBUG)
-	OPT	= -O2
-	OBJDIR	= release
+  OPT = -O2
+  OBJDIR = release
 else
-	OPT	= -g
-	OBJDIR	= debug
+  OPT = -g
+  OBJDIR = debug
 endif
 
 # The following lines defines your compiler.
 ifdef CWFolder
-	METROWERKS = $(CWFolder)
+  METROWERKS = $(CWFolder)
 endif
 ifdef METROWERKS
-	# MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support
-	MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support/Metrowerks Support
-	CC = mwccnlm
+  # MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support
+  MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support/Metrowerks Support
+  CC = mwccnlm
 else
-	CC = gcc
+  CC = gcc
 endif
-PERL	= perl
+PERL = perl
 # Here you can find a native Win32 binary of the original awk:
 # http://www.gknw.net/development/prgtools/awk-20100523.zip
-AWK	= awk
-CP	= cp -afv
-MKDIR	= mkdir
-# RM	= rm -f
+AWK = awk
+CP = cp -afv
+MKDIR = mkdir
+# RM = rm -f
 # If you want to mark the target as MTSAFE you will need a tool for
 # generating the xdc data for the linker; here's a minimal tool:
 # http://www.gknw.net/development/prgtools/mkxdc.zip
-MPKXDC	= mkxdc
+MPKXDC = mkxdc
 
 # LIBARCH_U = $(shell $(AWK) 'BEGIN {print toupper(ARGV[1])}' $(LIBARCH))
 LIBARCH_L = $(shell $(AWK) 'BEGIN {print tolower(ARGV[1])}' $(LIBARCH))
@@ -118,52 +118,52 @@ LIBARCH_L = $(shell $(AWK) 'BEGIN {print tolower(ARGV[1])}' $(LIBARCH))
 -include $(OBJDIR)/version.inc
 
 # Global flags for all compilers
-CFLAGS	+= $(OPT) -D$(DB) -DNETWARE -DHAVE_CONFIG_H -nostdinc
+CFLAGS += $(OPT) -D$(DB) -DNETWARE -DHAVE_CONFIG_H -nostdinc
 
 ifeq ($(CC),mwccnlm)
-LD	= mwldnlm
-LDFLAGS	= -nostdlib $< $(PRELUDE) $(LDLIBS) -o $@ -commandfile
-LIBEXT	= lib
-CFLAGS	+= -gccinc -inline off -opt nointrinsics -proc 586
-CFLAGS	+= -relax_pointers
-#CFLAGS	+= -w on
-ifeq ($(LIBARCH),LIBC)
-ifeq ($(POSIXFL),1)
-	PRELUDE = $(NDK_LIBC)/imports/posixpre.o
-else
-	PRELUDE = $(NDK_LIBC)/imports/libcpre.o
-endif
-	CFLAGS += -align 4
+  LD = mwldnlm
+  LDFLAGS = -nostdlib $< $(PRELUDE) $(LDLIBS) -o $@ -commandfile
+  LIBEXT  = lib
+  CFLAGS  += -gccinc -inline off -opt nointrinsics -proc 586
+  CFLAGS  += -relax_pointers
+  #CFLAGS += -w on
+  ifeq ($(LIBARCH),LIBC)
+    ifeq ($(POSIXFL),1)
+      PRELUDE = $(NDK_LIBC)/imports/posixpre.o
+    else
+      PRELUDE = $(NDK_LIBC)/imports/libcpre.o
+    endif
+    CFLAGS += -align 4
+  else
+    # PRELUDE = $(NDK_CLIB)/imports/clibpre.o
+    # to avoid the __init_* / __deinit_* woes don't use prelude from NDK
+    PRELUDE = "$(MWCW_PATH)/libraries/runtime/prelude.obj"
+    # CFLAGS += -include "$(MWCW_PATH)/headers/nlm_clib_prefix.h"
+    CFLAGS += -align 1
+  endif
 else
-	# PRELUDE = $(NDK_CLIB)/imports/clibpre.o
-	# to avoid the __init_* / __deinit_* woes don't use prelude from NDK
-	PRELUDE = "$(MWCW_PATH)/libraries/runtime/prelude.obj"
-	# CFLAGS += -include "$(MWCW_PATH)/headers/nlm_clib_prefix.h"
-	CFLAGS += -align 1
-endif
-else
-LD	= nlmconv
-LDFLAGS	= -T
-LIBEXT	= a
-CFLAGS	+= -m32
-CFLAGS  += -fno-builtin -fno-strict-aliasing
-ifeq ($(findstring gcc,$(CC)),gcc)
-CFLAGS  += -fpcc-struct-return
-endif
-CFLAGS	+= -Wall # -pedantic
-ifeq ($(LIBARCH),LIBC)
-ifeq ($(POSIXFL),1)
-	PRELUDE = $(NDK_LIBC)/imports/posixpre.gcc.o
-else
-	PRELUDE = $(NDK_LIBC)/imports/libcpre.gcc.o
-endif
-else
-	# PRELUDE = $(NDK_CLIB)/imports/clibpre.gcc.o
-	# to avoid the __init_* / __deinit_* woes don't use prelude from NDK
-	# http://www.gknw.net/development/mk_nlm/gcc_pre.zip
-	PRELUDE = $(NDK_ROOT)/pre/prelude.o
-	CFLAGS += -include $(NDKBASE)/nlmconv/genlm.h
-endif
+  LD = nlmconv
+  LDFLAGS = -T
+  LIBEXT  = a
+  CFLAGS  += -m32
+  CFLAGS  += -fno-builtin -fno-strict-aliasing
+  ifeq ($(findstring gcc,$(CC)),gcc)
+    CFLAGS += -fpcc-struct-return
+  endif
+  CFLAGS += -Wall # -pedantic
+  ifeq ($(LIBARCH),LIBC)
+    ifeq ($(POSIXFL),1)
+      PRELUDE = $(NDK_LIBC)/imports/posixpre.gcc.o
+    else
+      PRELUDE = $(NDK_LIBC)/imports/libcpre.gcc.o
+    endif
+  else
+    # PRELUDE = $(NDK_CLIB)/imports/clibpre.gcc.o
+    # to avoid the __init_* / __deinit_* woes don't use prelude from NDK
+    # http://www.gknw.net/development/mk_nlm/gcc_pre.zip
+    PRELUDE = $(NDK_ROOT)/pre/prelude.o
+    CFLAGS += -include $(NDKBASE)/nlmconv/genlm.h
+  endif
 endif
 
 NDK_ROOT = $(NDKBASE)/ndk
@@ -216,91 +216,91 @@ ENABLE_IPV6 = 1
 endif
 
 ifdef LINK_STATIC
-	LDLIBS	= $(CURL_LIB)/libcurl.$(LIBEXT)
+  LDLIBS = $(CURL_LIB)/libcurl.$(LIBEXT)
 ifdef WITH_ARES
-	LDLIBS += $(LIBCARES_PATH)/libcares.$(LIBEXT)
+  LDLIBS += $(LIBCARES_PATH)/libcares.$(LIBEXT)
 endif
 else
-	MODULES	= libcurl.nlm
-	IMPORTS	= @$(CURL_LIB)/libcurl.imp
+  MODULES = libcurl.nlm
+  IMPORTS = @$(CURL_LIB)/libcurl.imp
 endif
 ifdef WITH_SSH2
-	# INCLUDES += -I$(LIBSSH2_PATH)/include
-ifdef LINK_STATIC
-	LDLIBS += $(LIBSSH2_PATH)/nw/libssh2.$(LIBEXT)
-else
-	MODULES += libssh2.nlm
-	IMPORTS += @$(LIBSSH2_PATH)/nw/libssh2.imp
-endif
+  # INCLUDES += -I$(LIBSSH2_PATH)/include
+  ifdef LINK_STATIC
+    LDLIBS += $(LIBSSH2_PATH)/nw/libssh2.$(LIBEXT)
+  else
+    MODULES += libssh2.nlm
+    IMPORTS += @$(LIBSSH2_PATH)/nw/libssh2.imp
+  endif
 endif
 ifdef WITH_RTMP
-	# INCLUDES += -I$(LIBRTMP_PATH)
+  # INCLUDES += -I$(LIBRTMP_PATH)
 ifdef LINK_STATIC
-	LDLIBS += $(LIBRTMP_PATH)/librtmp/librtmp.$(LIBEXT)
+  LDLIBS += $(LIBRTMP_PATH)/librtmp/librtmp.$(LIBEXT)
 endif
 endif
 ifdef WITH_SSL
-	INCLUDES += -I$(OPENSSL_PATH)/outinc_nw_$(LIBARCH_L)
-	LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/ssl.$(LIBEXT)
-	LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/crypto.$(LIBEXT)
-	IMPORTS += GetProcessSwitchCount RunningProcess
+  INCLUDES += -I$(OPENSSL_PATH)/outinc_nw_$(LIBARCH_L)
+  LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/ssl.$(LIBEXT)
+  LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/crypto.$(LIBEXT)
+  IMPORTS += GetProcessSwitchCount RunningProcess
 else
 ifdef WITH_AXTLS
-	INCLUDES += -I$(AXTLS_PATH)/inc
+  INCLUDES += -I$(AXTLS_PATH)/inc
 ifdef LINK_STATIC
-	LDLIBS += $(AXTLS_PATH)/lib/libaxtls.$(LIBEXT)
+  LDLIBS += $(AXTLS_PATH)/lib/libaxtls.$(LIBEXT)
 else
-	MODULES += libaxtls.nlm
-	IMPORTS += $(AXTLS_PATH)/lib/libaxtls.imp
+  MODULES += libaxtls.nlm
+  IMPORTS += $(AXTLS_PATH)/lib/libaxtls.imp
 endif
 endif
 endif
 ifdef WITH_ZLIB
-	# INCLUDES += -I$(ZLIB_PATH)
+  # INCLUDES += -I$(ZLIB_PATH)
 ifdef LINK_STATIC
-	LDLIBS += $(ZLIB_PATH)/nw/$(LIBARCH)/libz.$(LIBEXT)
+  LDLIBS += $(ZLIB_PATH)/nw/$(LIBARCH)/libz.$(LIBEXT)
 else
-	MODULES += libz.nlm
-	IMPORTS += @$(ZLIB_PATH)/nw/$(LIBARCH)/libz.imp
+  MODULES += libz.nlm
+  IMPORTS += @$(ZLIB_PATH)/nw/$(LIBARCH)/libz.imp
 endif
 endif
 ifdef WITH_IDN
-	# INCLUDES += -I$(LIBIDN_PATH)/include
-	LDLIBS += $(LIBIDN_PATH)/lib/libidn.$(LIBEXT)
+  # INCLUDES += -I$(LIBIDN_PATH)/include
+  LDLIBS += $(LIBIDN_PATH)/lib/libidn.$(LIBEXT)
 endif
 
 ifeq ($(LIBARCH),LIBC)
-	INCLUDES += -I$(NDK_LIBC)/include
-	# INCLUDES += -I$(NDK_LIBC)/include/nks
-	# INCLUDES += -I$(NDK_LIBC)/include/winsock
-	CFLAGS += -D_POSIX_SOURCE
+  INCLUDES += -I$(NDK_LIBC)/include
+  # INCLUDES += -I$(NDK_LIBC)/include/nks
+  # INCLUDES += -I$(NDK_LIBC)/include/winsock
+  CFLAGS += -D_POSIX_SOURCE
 else
-	INCLUDES += -I$(NDK_CLIB)/include/nlm
-	# INCLUDES += -I$(NDK_CLIB)/include
+  INCLUDES += -I$(NDK_CLIB)/include/nlm
+  # INCLUDES += -I$(NDK_CLIB)/include
 endif
 ifndef DISABLE_LDAP
-	# INCLUDES += -I$(NDK_LDAP)/$(LIBARCH_L)/inc
+  # INCLUDES += -I$(NDK_LDAP)/$(LIBARCH_L)/inc
 endif
-CFLAGS	+= $(INCLUDES)
+CFLAGS += $(INCLUDES)
 
 ifeq ($(MTSAFE),YES)
-	XDCOPT = -n
+  XDCOPT = -n
 endif
 ifeq ($(MTSAFE),NO)
-	XDCOPT = -u
+  XDCOPT = -u
 endif
 ifdef XDCOPT
-	XDCDATA = $(OBJDIR)/$(TARGET).xdc
+  XDCDATA = $(OBJDIR)/$(TARGET).xdc
 endif
 
 ifeq ($(findstring /sh,$(SHELL)),/sh)
-DL	= '
-DS	= /
-PCT	= %
+DL  = '
+DS  = /
+PCT = %
 #-include $(NDKBASE)/nlmconv/ncpfs.inc
 else
-DS	= \\
-PCT	= %%
+DS  = \\
+PCT = %%
 endif
 
 # Makefile.inc provides the CSOURCES and HHEADERS defines
diff --git a/docs/examples/curlgtk.c b/docs/examples/curlgtk.c
index c3129c198..79e89acc6 100644
--- a/docs/examples/curlgtk.c
+++ b/docs/examples/curlgtk.c
@@ -106,4 +106,3 @@ int main(int argc, char **argv)
   gdk_threads_leave();
   return 0;
 }
-
diff --git a/docs/examples/makefile.dj b/docs/examples/makefile.dj
index af761130c..17d93ab89 100644
--- a/docs/examples/makefile.dj
+++ b/docs/examples/makefile.dj
@@ -53,4 +53,3 @@ clean vclean realclean:
 	- rm -f $(PROGRAMS) depend.dj
 
 -include depend.dj
-
diff --git a/docs/examples/version-check.pl b/docs/examples/version-check.pl
index 074e50d8c..8f734fc75 100755
--- a/docs/examples/version-check.pl
+++ b/docs/examples/version-check.pl
@@ -101,5 +101,3 @@ for my $w (@recent) {
     }
     last;
 }
-
-
diff --git a/docs/libcurl/Makefile.inc b/docs/libcurl/Makefile.inc
index 8914aea3d..b4ff45dde 100644
--- a/docs/libcurl/Makefile.inc
+++ b/docs/libcurl/Makefile.inc
@@ -1,83 +1,83 @@
 # Shared between Makefile.am and CMakeLists.txt
 
-man_MANS =			\
- curl_easy_cleanup.3		\
- curl_easy_duphandle.3		\
- curl_easy_escape.3		\
- curl_easy_getinfo.3		\
- curl_easy_init.3		\
- curl_easy_pause.3		\
- curl_easy_perform.3		\
- curl_easy_recv.3		\
- curl_easy_reset.3		\
- curl_easy_send.3		\
- curl_easy_setopt.3		\
- curl_easy_strerror.3		\
- curl_easy_unescape.3		\
- curl_easy_upkeep.3		\
- curl_escape.3			\
- curl_formadd.3			\
- curl_formfree.3		\
- curl_formget.3			\
- curl_free.3			\
- curl_getdate.3			\
- curl_getenv.3			\
- curl_global_cleanup.3		\
- curl_global_init.3		\
- curl_global_init_mem.3		\
- curl_global_sslset.3		\
- curl_mime_addpart.3		\
- curl_mime_data.3		\
- curl_mime_data_cb.3		\
- curl_mime_encoder.3		\
- curl_mime_filedata.3		\
- curl_mime_filename.3		\
- curl_mime_free.3		\
- curl_mime_headers.3		\
- curl_mime_init.3		\
- curl_mime_name.3		\
- curl_mime_subparts.3		\
- curl_mime_type.3		\
- curl_mprintf.3			\
- curl_multi_add_handle.3	\
- curl_multi_assign.3		\
- curl_multi_cleanup.3		\
- curl_multi_fdset.3		\
- curl_multi_info_read.3		\
- curl_multi_init.3		\
- curl_multi_perform.3		\
- curl_multi_remove_handle.3	\
- curl_multi_setopt.3		\
- curl_multi_socket.3		\
- curl_multi_socket_action.3	\
- curl_multi_socket_all.3	\
- curl_multi_strerror.3		\
- curl_multi_timeout.3		\
- curl_multi_wait.3		\
- curl_share_cleanup.3		\
- curl_share_init.3		\
- curl_share_setopt.3		\
- curl_share_strerror.3		\
- curl_slist_append.3		\
- curl_slist_free_all.3		\
- curl_strequal.3		\
- curl_strnequal.3		\
- curl_unescape.3		\
- curl_url.3			\
- curl_url_cleanup.3		\
- curl_url_dup.3			\
- curl_url_get.3			\
- curl_url_set.3			\
- curl_version.3			\
- curl_version_info.3		\
- libcurl-easy.3			\
- libcurl-env.3			\
- libcurl-errors.3		\
- libcurl-multi.3		\
- libcurl-security.3		\
- libcurl-share.3		\
- libcurl-symbols.3		\
- libcurl-thread.3		\
- libcurl-tutorial.3		\
- libcurl-url.3                  \
+man_MANS = \
+ curl_easy_cleanup.3 \
+ curl_easy_duphandle.3 \
+ curl_easy_escape.3 \
+ curl_easy_getinfo.3 \
+ curl_easy_init.3 \
+ curl_easy_pause.3 \
+ curl_easy_perform.3 \
+ curl_easy_recv.3 \
+ curl_easy_reset.3 \
+ curl_easy_send.3 \
+ curl_easy_setopt.3 \
+ curl_easy_strerror.3 \
+ curl_easy_unescape.3 \
+ curl_easy_upkeep.3 \
+ curl_escape.3 \
+ curl_formadd.3 \
+ curl_formfree.3 \
+ curl_formget.3 \
+ curl_free.3 \
+ curl_getdate.3 \
+ curl_getenv.3 \
+ curl_global_cleanup.3 \
+ curl_global_init.3 \
+ curl_global_init_mem.3 \
+ curl_global_sslset.3 \
+ curl_mime_addpart.3 \
+ curl_mime_data.3 \
+ curl_mime_data_cb.3 \
+ curl_mime_encoder.3 \
+ curl_mime_filedata.3 \
+ curl_mime_filename.3 \
+ curl_mime_free.3 \
+ curl_mime_headers.3 \
+ curl_mime_init.3 \
+ curl_mime_name.3 \
+ curl_mime_subparts.3 \
+ curl_mime_type.3 \
+ curl_mprintf.3 \
+ curl_multi_add_handle.3 \
+ curl_multi_assign.3 \
+ curl_multi_cleanup.3 \
+ curl_multi_fdset.3 \
+ curl_multi_info_read.3 \
+ curl_multi_init.3 \
+ curl_multi_perform.3 \
+ curl_multi_remove_handle.3 \
+ curl_multi_setopt.3 \
+ curl_multi_socket.3 \
+ curl_multi_socket_action.3 \
+ curl_multi_socket_all.3 \
+ curl_multi_strerror.3 \
+ curl_multi_timeout.3 \
+ curl_multi_wait.3 \
+ curl_share_cleanup.3 \
+ curl_share_init.3 \
+ curl_share_setopt.3 \
+ curl_share_strerror.3 \
+ curl_slist_append.3 \
+ curl_slist_free_all.3 \
+ curl_strequal.3 \
+ curl_strnequal.3 \
+ curl_unescape.3 \
+ curl_url.3 \
+ curl_url_cleanup.3 \
+ curl_url_dup.3 \
+ curl_url_get.3 \
+ curl_url_set.3 \
+ curl_version.3 \
+ curl_version_info.3 \
+ libcurl-easy.3 \
+ libcurl-env.3 \
+ libcurl-errors.3 \
+ libcurl-multi.3 \
+ libcurl-security.3 \
+ libcurl-share.3 \
+ libcurl-symbols.3 \
+ libcurl-thread.3 \
+ libcurl-tutorial.3 \
+ libcurl-url.3 \
  libcurl.3
diff --git a/docs/libcurl/curl_easy_duphandle.3 b/docs/libcurl/curl_easy_duphandle.3
index 262cebd32..cef3870d5 100644
--- a/docs/libcurl/curl_easy_duphandle.3
+++ b/docs/libcurl/curl_easy_duphandle.3
@@ -49,4 +49,3 @@ returned.
 .SH "SEE ALSO"
 .BR curl_easy_init "(3)," curl_easy_cleanup "(3)," curl_easy_reset "(3),"
 .BR curl_global_init "(3)"
-
diff --git a/docs/libcurl/curl_easy_perform.3 b/docs/libcurl/curl_easy_perform.3
index 48c1f3117..007f609e0 100644
--- a/docs/libcurl/curl_easy_perform.3
+++ b/docs/libcurl/curl_easy_perform.3
@@ -72,4 +72,3 @@ if(curl) {
 .BR curl_easy_init "(3), " curl_easy_setopt "(3), "
 .BR curl_multi_add_handle "(3), " curl_multi_perform "(3), "
 .BR libcurl-errors "(3), "
-
diff --git a/docs/libcurl/curl_easy_reset.3 b/docs/libcurl/curl_easy_reset.3
index 0bafb64ac..539f9c716 100644
--- a/docs/libcurl/curl_easy_reset.3
+++ b/docs/libcurl/curl_easy_reset.3
@@ -41,4 +41,3 @@ Nothing
 .SH "SEE ALSO"
 .BR curl_easy_init "(3)," curl_easy_cleanup "(3)," curl_easy_setopt "(3),"
 .BR curl_easy_duphandle "(3)"
-
diff --git a/docs/libcurl/curl_global_init_mem.3 b/docs/libcurl/curl_global_init_mem.3
index 7252cf9fa..610ab5607 100644
--- a/docs/libcurl/curl_global_init_mem.3
+++ b/docs/libcurl/curl_global_init_mem.3
@@ -62,4 +62,3 @@ screw things up for libcurl. Take care!
 .SH "SEE ALSO"
 .BR curl_global_init "(3), "
 .BR curl_global_cleanup "(3), "
-
diff --git a/docs/libcurl/curl_multi_init.3 b/docs/libcurl/curl_multi_init.3
index e84eb768f..829c5c246 100644
--- a/docs/libcurl/curl_multi_init.3
+++ b/docs/libcurl/curl_multi_init.3
@@ -37,4 +37,3 @@ If this function returns NULL, something went wrong and you cannot use the
 other curl functions.
 .SH "SEE ALSO"
 .BR curl_multi_cleanup "(3)," curl_global_init "(3)," curl_easy_init "(3)"
-
diff --git a/docs/libcurl/curl_multi_timeout.3 b/docs/libcurl/curl_multi_timeout.3
index 71b2b320a..d915f9e4f 100644
--- a/docs/libcurl/curl_multi_timeout.3
+++ b/docs/libcurl/curl_multi_timeout.3
@@ -76,4 +76,3 @@ This function was added in libcurl 7.15.4.
 .SH "SEE ALSO"
 .BR curl_multi_fdset "(3), " curl_multi_info_read "(3), "
 .BR curl_multi_socket "(3), " curl_multi_setopt "(3) "
-
diff --git a/docs/libcurl/curl_share_init.3 b/docs/libcurl/curl_share_init.3
index 545ba038f..e582828b4 100644
--- a/docs/libcurl/curl_share_init.3
+++ b/docs/libcurl/curl_share_init.3
@@ -41,4 +41,3 @@ If this function returns NULL, something went wrong (out of memory, etc.)
 and therefore the share object was not created.
 .SH "SEE ALSO"
 .BR curl_share_cleanup "(3), " curl_share_setopt "(3)"
-
diff --git a/docs/libcurl/curl_slist_free_all.3 b/docs/libcurl/curl_slist_free_all.3
index 82cb80ff2..180d34a61 100644
--- a/docs/libcurl/curl_slist_free_all.3
+++ b/docs/libcurl/curl_slist_free_all.3
@@ -53,4 +53,3 @@ curl_slist_free_all(slist); /* free the list again */
 .fi
 .SH "SEE ALSO"
 .BR curl_slist_append "(3), "
-
diff --git a/docs/libcurl/curl_version_info.3 b/docs/libcurl/curl_version_info.3
index e69e312f4..cc9353ca1 100644
--- a/docs/libcurl/curl_version_info.3
+++ b/docs/libcurl/curl_version_info.3
@@ -186,4 +186,3 @@ entry.
 A pointer to a curl_version_info_data struct.
 .SH "SEE ALSO"
 \fIcurl_version(3)\fP
-
diff --git a/docs/libcurl/libcurl-security.3 b/docs/libcurl/libcurl-security.3
index 79952d314..0cfdddea8 100644
--- a/docs/libcurl/libcurl-security.3
+++ b/docs/libcurl/libcurl-security.3
@@ -339,4 +339,3 @@ sensitive data.
 To avoid this problem, you must of course use your common sense. Often, you
 can just edit out the sensitive data or just search/replace your true
 information with faked data.
-
diff --git a/docs/libcurl/libcurl-tutorial.3 b/docs/libcurl/libcurl-tutorial.3
index dd5d27555..aeca76e2e 100644
--- a/docs/libcurl/libcurl-tutorial.3
+++ b/docs/libcurl/libcurl-tutorial.3
@@ -505,7 +505,7 @@ and then a file with binary contents and uploads the whole thing.
  part = curl_mime_addpart(mutipart);
  curl_mime_name(part, "logotype-image");
  curl_mime_filedata(part, "curl.png");
- 
+
  /* Set the form info */
  curl_easy_setopt(easyhandle, CURLOPT_MIMEPOST, multipart);
 
diff --git a/docs/libcurl/opts/CURLMOPT_MAXCONNECTS.3 b/docs/libcurl/opts/CURLMOPT_MAXCONNECTS.3
index eda68568c..8f5ac7b86 100644
--- a/docs/libcurl/opts/CURLMOPT_MAXCONNECTS.3
+++ b/docs/libcurl/opts/CURLMOPT_MAXCONNECTS.3
@@ -63,4 +63,3 @@ Returns CURLM_OK if the option is supported, and CURLM_UNKNOWN_OPTION if not.
 .SH "SEE ALSO"
 .BR CURLMOPT_MAX_HOST_CONNECTIONS "(3), "
 .BR CURLOPT_MAXCONNECTS "(3), "
-
diff --git a/docs/libcurl/opts/CURLMOPT_PIPELINING_SERVER_BL.3 b/docs/libcurl/opts/CURLMOPT_PIPELINING_SERVER_BL.3
index 660afecd3..457bef232 100644
--- a/docs/libcurl/opts/CURLMOPT_PIPELINING_SERVER_BL.3
+++ b/docs/libcurl/opts/CURLMOPT_PIPELINING_SERVER_BL.3
@@ -34,7 +34,7 @@ from pipelining, i.e server types that are known to not support HTTP
 pipelining. The array is copied by libcurl.
 
 Note that the comparison matches if the Server: header begins with the string
-in the blacklist, i.e "Server: Ninja 1.2.3" and "Server: Ninja 1.4.0" can 
+in the blacklist, i.e "Server: Ninja 1.2.3" and "Server: Ninja 1.4.0" can
 both be blacklisted by having "Ninja" in the backlist.
 
 Pass a NULL pointer to clear the blacklist.
diff --git a/docs/libcurl/opts/CURLMOPT_SOCKETFUNCTION.3 b/docs/libcurl/opts/CURLMOPT_SOCKETFUNCTION.3
index 2b2b322fe..e55ff5e0b 100644
--- a/docs/libcurl/opts/CURLMOPT_SOCKETFUNCTION.3
+++ b/docs/libcurl/opts/CURLMOPT_SOCKETFUNCTION.3
@@ -98,4 +98,3 @@ Returns CURLM_OK.
 .SH "SEE ALSO"
 .BR CURLMOPT_SOCKETDATA "(3), " curl_multi_socket_action "(3), "
 .BR CURLMOPT_TIMERFUNCTION "(3) "
-
diff --git a/docs/libcurl/opts/CURLOPT_CONNECTTIMEOUT_MS.3 b/docs/libcurl/opts/CURLOPT_CONNECTTIMEOUT_MS.3
index 2a7f107a8..5fad75c55 100644
--- a/docs/libcurl/opts/CURLOPT_CONNECTTIMEOUT_MS.3
+++ b/docs/libcurl/opts/CURLOPT_CONNECTTIMEOUT_MS.3
@@ -60,5 +60,5 @@ Always
 .SH RETURN VALUE
 Returns CURLE_OK
 .SH "SEE ALSO"
-.BR CURLOPT_CONNECTTIMEOUT "(3), " 
+.BR CURLOPT_CONNECTTIMEOUT "(3), "
 .BR CURLOPT_TIMEOUT "(3), " CURLOPT_LOW_SPEED_LIMIT "(3), "
diff --git a/docs/libcurl/opts/CURLOPT_INFILESIZE_LARGE.3 b/docs/libcurl/opts/CURLOPT_INFILESIZE_LARGE.3
index f866cd43d..cdc38f75c 100644
--- a/docs/libcurl/opts/CURLOPT_INFILESIZE_LARGE.3
+++ b/docs/libcurl/opts/CURLOPT_INFILESIZE_LARGE.3
@@ -32,7 +32,7 @@ CURLcode curl_easy_setopt(CURL *handle, CURLOPT_INFILESIZE_LARGE,
 .SH DESCRIPTION
 When uploading a file to a remote site, \fIfilesize\fP should be used to tell
 libcurl what the expected size of the input file is. This value must be passed
-as a \fBcurl_off_t\fP. 
+as a \fBcurl_off_t\fP.
 
 For uploading using SCP, this option or \fICURLOPT_INFILESIZE(3)\fP is
 mandatory.
diff --git a/docs/libcurl/opts/CURLOPT_PASSWORD.3 b/docs/libcurl/opts/CURLOPT_PASSWORD.3
index 3c5f7de40..17789407a 100644
--- a/docs/libcurl/opts/CURLOPT_PASSWORD.3
+++ b/docs/libcurl/opts/CURLOPT_PASSWORD.3
@@ -61,4 +61,3 @@ CURLE_OUT_OF_MEMORY if there was insufficient heap space.
 .SH "SEE ALSO"
 .BR CURLOPT_USERPWD "(3), " CURLOPT_USERNAME "(3), "
 .BR CURLOPT_HTTPAUTH "(3), " CURLOPT_PROXYAUTH "(3)"
-
diff --git a/docs/libcurl/opts/CURLOPT_PATH_AS_IS.3 b/docs/libcurl/opts/CURLOPT_PATH_AS_IS.3
index 8ed23b450..d9ef5f907 100644
--- a/docs/libcurl/opts/CURLOPT_PATH_AS_IS.3
+++ b/docs/libcurl/opts/CURLOPT_PATH_AS_IS.3
@@ -62,4 +62,3 @@ Returns CURLE_OK if the option is supported, and CURLE_UNKNOWN_OPTION if not.
 .SH "SEE ALSO"
 .BR CURLOPT_STDERR "(3), " CURLOPT_DEBUGFUNCTION "(3), "
 .BR CURLOPT_URL "(3), "
-
diff --git a/docs/libcurl/opts/CURLOPT_PRE_PROXY.3 b/docs/libcurl/opts/CURLOPT_PRE_PROXY.3
index 8894c16da..de5b0f49c 100644
--- a/docs/libcurl/opts/CURLOPT_PRE_PROXY.3
+++ b/docs/libcurl/opts/CURLOPT_PRE_PROXY.3
@@ -77,4 +77,3 @@ Returns CURLE_OK if proxies are supported, CURLE_UNKNOWN_OPTION if not, or
 CURLE_OUT_OF_MEMORY if there was insufficient heap space.
 .SH "SEE ALSO"
 .BR CURLOPT_PROXY "(3), " CURLOPT_HTTPPROXYTUNNEL "(3), "
-
diff --git a/docs/libcurl/opts/CURLOPT_PROXY_SSLVERSION.3 b/docs/libcurl/opts/CURLOPT_PROXY_SSLVERSION.3
index 73c2c9766..15e92878d 100644
--- a/docs/libcurl/opts/CURLOPT_PROXY_SSLVERSION.3
+++ b/docs/libcurl/opts/CURLOPT_PROXY_SSLVERSION.3
@@ -93,4 +93,3 @@ Returns CURLE_OK if the option is supported, and CURLE_UNKNOWN_OPTION if not.
 .SH "SEE ALSO"
 .BR CURLOPT_USE_SSL "(3), " CURLOPT_HTTP_VERSION "(3), "
 .BR CURLOPT_IPRESOLVE "(3) " CURLOPT_SSLVERSION "(3), "
-
diff --git a/docs/libcurl/opts/CURLOPT_TIMEOUT_MS.3 b/docs/libcurl/opts/CURLOPT_TIMEOUT_MS.3
index 2a7afb104..00981b3bd 100644
--- a/docs/libcurl/opts/CURLOPT_TIMEOUT_MS.3
+++ b/docs/libcurl/opts/CURLOPT_TIMEOUT_MS.3
@@ -70,5 +70,5 @@ Always
 .SH RETURN VALUE
 Returns CURLE_OK
 .SH "SEE ALSO"
-.BR CURLOPT_TIMEOUT "(3), " 
+.BR CURLOPT_TIMEOUT "(3), "
 .BR CURLOPT_CONNECTTIMEOUT "(3), " CURLOPT_LOW_SPEED_LIMIT "(3), "
diff --git a/include/curl/Makefile.am b/include/curl/Makefile.am
index bf5f06120..16d97e1c4 100644
--- a/include/curl/Makefile.am
+++ b/include/curl/Makefile.am
@@ -20,8 +20,8 @@
 #
 ###########################################################################
 pkginclude_HEADERS = \
-	curl.h curlver.h easy.h mprintf.h stdcheaders.h multi.h \
-	typecheck-gcc.h system.h urlapi.h
+  curl.h curlver.h easy.h mprintf.h stdcheaders.h multi.h \
+  typecheck-gcc.h system.h urlapi.h
 
 pkgincludedir= $(includedir)/curl
 
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 87cbe8174..bd6d42707 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -124,4 +124,3 @@ install(EXPORT libcurl-target
         NAMESPACE CURL::
         DESTINATION ${CURL_INSTALL_CMAKE_DIR}
 )
-
diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom
index 77e5a6e0a..5f335cedb 100644
--- a/lib/Makefile.Watcom
+++ b/lib/Makefile.Watcom
@@ -272,4 +272,3 @@ $(RESOURCE): libcurl.rc
 
 .c{$(OBJ_STAT)}.obj:
 	$(CC) $(CFLAGS) -DCURL_STATICLIB $[@ -fo=$^@
-	
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 7e82d467e..4f3c16db4 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -23,13 +23,13 @@ AUTOMAKE_OPTIONS = foreign nostdinc
 
 CMAKE_DIST = CMakeLists.txt curl_config.h.cmake
 
-EXTRA_DIST = Makefile.m32 config-win32.h	                        \
- config-win32ce.h config-riscos.h config-mac.h curl_config.h.in		\
- makefile.dj config-dos.h libcurl.plist libcurl.rc config-amigaos.h	\
- makefile.amiga Makefile.netware nwlib.c nwos.c config-win32ce.h	\
- config-os400.h setup-os400.h config-symbian.h Makefile.Watcom		\
- config-tpf.h mk-ca-bundle.pl mk-ca-bundle.vbs $(CMAKE_DIST)	\
- firefox-db2pem.sh config-vxworks.h Makefile.vxworks checksrc.pl	\
+EXTRA_DIST = Makefile.m32 config-win32.h                            \
+ config-win32ce.h config-riscos.h config-mac.h curl_config.h.in     \
+ makefile.dj config-dos.h libcurl.plist libcurl.rc config-amigaos.h \
+ makefile.amiga Makefile.netware nwlib.c nwos.c config-win32ce.h    \
+ config-os400.h setup-os400.h config-symbian.h Makefile.Watcom      \
+ config-tpf.h mk-ca-bundle.pl mk-ca-bundle.vbs $(CMAKE_DIST)        \
+ firefox-db2pem.sh config-vxworks.h Makefile.vxworks checksrc.pl    \
  objnames-test08.sh objnames-test10.sh objnames.inc
 
 lib_LTLIBRARIES = libcurl.la
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 773187ad7..ae88f4dce 100644
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -91,23 +91,23 @@ ifeq ($(CURL_RANLIB),)
 CURL_RANLIB := $(CROSSPREFIX)ranlib
 endif
 
-CC	= $(CURL_CC)
-CFLAGS	= $(CURL_CFLAG_EXTRAS) -g -O2 -Wall -W
-CFLAGS	+= -fno-strict-aliasing
+CC = $(CURL_CC)
+CFLAGS = $(CURL_CFLAG_EXTRAS) -g -O2 -Wall -W
+CFLAGS += -fno-strict-aliasing
 # comment LDFLAGS below to keep debug info
-LDFLAGS	= $(CURL_LDFLAG_EXTRAS) $(CURL_LDFLAG_EXTRAS_DLL) -s
-AR	= $(CURL_AR)
-RANLIB	= $(CURL_RANLIB)
-RC	= $(CROSSPREFIX)windres
-RCFLAGS	= --include-dir=$(PROOT)/include -DDEBUGBUILD=0 -O COFF
-STRIP	= $(CROSSPREFIX)strip -g
+LDFLAGS = $(CURL_LDFLAG_EXTRAS) $(CURL_LDFLAG_EXTRAS_DLL) -s
+AR = $(CURL_AR)
+RANLIB = $(CURL_RANLIB)
+RC = $(CROSSPREFIX)windres
+RCFLAGS = --include-dir=$(PROOT)/include -DDEBUGBUILD=0 -O COFF
+STRIP   = $(CROSSPREFIX)strip -g
 
 # Set environment var ARCH to your architecture to override autodetection.
 ifndef ARCH
 ifeq ($(findstring x86_64,$(shell $(CC) -dumpmachine)),x86_64)
-ARCH	= w64
+ARCH = w64
 else
-ARCH	= w32
+ARCH = w32
 endif
 endif
 
@@ -123,30 +123,30 @@ endif
 
 # Platform-dependent helper tool macros
 ifeq ($(findstring /sh,$(SHELL)),/sh)
-DEL	= rm -f $1
-RMDIR	= rm -fr $1
-MKDIR	= mkdir -p $1
-COPY	= -cp -afv $1 $2
-#COPYR	= -cp -afr $1/* $2
-COPYR	= -rsync -aC $1/* $2
-TOUCH	= touch $1
-CAT	= cat
-ECHONL	= echo ""
-DL	= '
+DEL     = rm -f $1
+RMDIR   = rm -fr $1
+MKDIR   = mkdir -p $1
+COPY    = -cp -afv $1 $2
+#COPYR  = -cp -afr $1/* $2
+COPYR   = -rsync -aC $1/* $2
+TOUCH   = touch $1
+CAT     = cat
+ECHONL  = echo ""
+DL = '
 else
 ifeq "$(OS)" "Windows_NT"
-DEL	= -del 2>NUL /q /f $(subst /,\,$1)
-RMDIR	= -rd 2>NUL /q /s $(subst /,\,$1)
+DEL     = -del 2>NUL /q /f $(subst /,\,$1)
+RMDIR   = -rd 2>NUL /q /s $(subst /,\,$1)
 else
-DEL	= -del 2>NUL $(subst /,\,$1)
-RMDIR	= -deltree 2>NUL /y $(subst /,\,$1)
-endif
-MKDIR	= -md 2>NUL $(subst /,\,$1)
-COPY	= -copy 2>NUL /y $(subst /,\,$1) $(subst /,\,$2)
-COPYR	= -xcopy 2>NUL /q /y /e $(subst /,\,$1) $(subst /,\,$2)
-TOUCH	= copy 2>&1>NUL /b $(subst /,\,$1) +,,
-CAT	= type
-ECHONL	= $(ComSpec) /c echo.
+DEL     = -del 2>NUL $(subst /,\,$1)
+RMDIR   = -deltree 2>NUL /y $(subst /,\,$1)
+endif
+MKDIR   = -md 2>NUL $(subst /,\,$1)
+COPY    = -copy 2>NUL /y $(subst /,\,$1) $(subst /,\,$2)
+COPYR   = -xcopy 2>NUL /q /y /e $(subst /,\,$1) $(subst /,\,$2)
+TOUCH   = copy 2>&1>NUL /b $(subst /,\,$1) +,,
+CAT     = type
+ECHONL  = $(ComSpec) /c echo.
 endif
 
 ########################################################
diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index a2032a1e2..fa6beec00 100644
--- a/lib/Makefile.netware
+++ b/lib/Makefile.netware
@@ -31,7 +31,7 @@
 
 # Edit the path below to point to the base of your Novell NDK.
 ifndef NDKBASE
-NDKBASE	= c:/novell
+NDKBASE = c:/novell
 endif
 
 # Edit the path below to point to the base of your Zlib sources.
@@ -80,19 +80,19 @@ LIBCARES_PATH = ../ares
 endif
 
 ifndef INSTDIR
-INSTDIR	= ..$(DS)curl-$(LIBCURL_VERSION_STR)-bin-nw
+INSTDIR = ..$(DS)curl-$(LIBCURL_VERSION_STR)-bin-nw
 endif
 
 # Edit the vars below to change NLM target settings.
 TARGET  = libcurl
-VERSION	= $(LIBCURL_VERSION)
-COPYR	= Copyright (C) $(LIBCURL_COPYRIGHT_STR)
-DESCR	= curl libcurl $(LIBCURL_VERSION_STR) ($(LIBARCH)) - https://curl.haxx.se
-MTSAFE	= YES
-STACK	= 64000
-SCREEN	= none
-EXPORTF	= $(TARGET).imp
-EXPORTS	= @$(EXPORTF)
+VERSION = $(LIBCURL_VERSION)
+COPYR   = Copyright (C) $(LIBCURL_COPYRIGHT_STR)
+DESCR   = curl libcurl $(LIBCURL_VERSION_STR) ($(LIBARCH)) - https://curl.haxx.se
+MTSAFE  = YES
+STACK   = 64000
+SCREEN  = none
+EXPORTF = $(TARGET).imp
+EXPORTS = @$(EXPORTF)
 
 # Uncomment the next line to enable linking with POSIX semantics.
 # POSIXFL = 1
@@ -104,39 +104,39 @@ endif
 
 # must be equal to NDEBUG or DEBUG, CURLDEBUG
 ifndef DB
-DB	= NDEBUG
+DB = NDEBUG
 endif
 # Optimization: -O<n> or debugging: -g
 ifeq ($(DB),NDEBUG)
-	OPT	= -O2
-	OBJDIR	= release
+  OPT = -O2
+  OBJDIR = release
 else
-	OPT	= -g
-	OBJDIR	= debug
+  OPT = -g
+  OBJDIR = debug
 endif
 
 # The following lines defines your compiler.
 ifdef CWFolder
-	METROWERKS = $(CWFolder)
+  METROWERKS = $(CWFolder)
 endif
 ifdef METROWERKS
-	# MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support
-	MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support/Metrowerks Support
-	CC = mwccnlm
+  # MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support
+  MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support/Metrowerks Support
+  CC = mwccnlm
 else
-	CC = gcc
+  CC = gcc
 endif
-PERL	= perl
+PERL = perl
 # Here you can find a native Win32 binary of the original awk:
 # http://www.gknw.net/development/prgtools/awk-20100523.zip
-AWK	= awk
-CP	= cp -afv
-MKDIR	= mkdir
-# RM	= rm -f
+AWK = awk
+CP  = cp -afv
+MKDIR = mkdir
+# RM = rm -f
 # If you want to mark the target as MTSAFE you will need a tool for
 # generating the xdc data for the linker; here's a minimal tool:
 # http://www.gknw.net/development/prgtools/mkxdc.zip
-MPKXDC	= mkxdc
+MPKXDC = mkxdc
 
 # LIBARCH_U = $(shell $(AWK) 'BEGIN {print toupper(ARGV[1])}' $(LIBARCH))
 LIBARCH_L = $(shell $(AWK) 'BEGIN {print tolower(ARGV[1])}' $(LIBARCH))
@@ -145,58 +145,58 @@ LIBARCH_L = $(shell $(AWK) 'BEGIN {print tolower(ARGV[1])}' $(LIBARCH))
 -include $(OBJDIR)/version.inc
 
 # Global flags for all compilers
-CFLAGS	+= $(OPT) -D$(DB) -DNETWARE -DHAVE_CONFIG_H -nostdinc
+CFLAGS += $(OPT) -D$(DB) -DNETWARE -DHAVE_CONFIG_H -nostdinc
 
 ifeq ($(CC),mwccnlm)
-LD	= mwldnlm
-LDFLAGS	= -nostdlib $(PRELUDE) $(OBJL) -o $@ -commandfile
-AR	= mwldnlm
-ARFLAGS	= -nostdlib -type library -o
-LIBEXT	= lib
-#RANLIB	=
-CFLAGS	+= -msgstyle gcc -gccinc -inline off -opt nointrinsics -proc 586
-CFLAGS	+= -relax_pointers
-#CFLAGS	+= -w on
-ifeq ($(LIBARCH),LIBC)
-ifeq ($(POSIXFL),1)
-	PRELUDE = $(NDK_LIBC)/imports/posixpre.o
-else
-	PRELUDE = $(NDK_LIBC)/imports/libcpre.o
-endif
-	CFLAGS += -align 4
-else
-	# PRELUDE = $(NDK_CLIB)/imports/clibpre.o
-	# to avoid the __init_* / __deinit_* woes don't use prelude from NDK
-	PRELUDE = "$(MWCW_PATH)/libraries/runtime/prelude.obj"
-	# CFLAGS += -include "$(MWCW_PATH)/headers/nlm_clib_prefix.h"
-	CFLAGS += -align 1
-endif
+  LD = mwldnlm
+  LDFLAGS = -nostdlib $(PRELUDE) $(OBJL) -o $@ -commandfile
+  AR = mwldnlm
+  ARFLAGS = -nostdlib -type library -o
+  LIBEXT  = lib
+  #RANLIB =
+  CFLAGS  += -msgstyle gcc -gccinc -inline off -opt nointrinsics -proc 586
+  CFLAGS  += -relax_pointers
+  #CFLAGS += -w on
+  ifeq ($(LIBARCH),LIBC)
+    ifeq ($(POSIXFL),1)
+      PRELUDE = $(NDK_LIBC)/imports/posixpre.o
+    else
+      PRELUDE = $(NDK_LIBC)/imports/libcpre.o
+    endif
+    CFLAGS += -align 4
+  else
+    # PRELUDE = $(NDK_CLIB)/imports/clibpre.o
+    # to avoid the __init_* / __deinit_* woes don't use prelude from NDK
+    PRELUDE = "$(MWCW_PATH)/libraries/runtime/prelude.obj"
+    # CFLAGS += -include "$(MWCW_PATH)/headers/nlm_clib_prefix.h"
+    CFLAGS += -align 1
+  endif
 else
-LD	= nlmconv
-LDFLAGS	= -T
-AR	= ar
-ARFLAGS	= -cq
-LIBEXT	= a
-RANLIB	= ranlib
-CFLAGS  += -m32
-CFLAGS	+= -fno-builtin -fno-strict-aliasing
-ifeq ($(findstring gcc,$(CC)),gcc)
-CFLAGS	+= -fpcc-struct-return
-endif
-CFLAGS	+= -Wall # -pedantic
-ifeq ($(LIBARCH),LIBC)
-ifeq ($(POSIXFL),1)
-	PRELUDE = $(NDK_LIBC)/imports/posixpre.gcc.o
-else
-	PRELUDE = $(NDK_LIBC)/imports/libcpre.gcc.o
-endif
-else
-	PRELUDE = $(NDK_CLIB)/imports/clibpre.gcc.o
-	# to avoid the __init_* / __deinit_* woes don't use prelude from NDK
-	# http://www.gknw.net/development/mk_nlm/gcc_pre.zip
-	# PRELUDE = $(NDK_ROOT)/pre/prelude.o
-	CFLAGS += -include $(NDKBASE)/nlmconv/genlm.h
-endif
+  LD = nlmconv
+  LDFLAGS = -T
+  AR = ar
+  ARFLAGS = -cq
+  LIBEXT  = a
+  RANLIB  = ranlib
+  CFLAGS  += -m32
+  CFLAGS  += -fno-builtin -fno-strict-aliasing
+  ifeq ($(findstring gcc,$(CC)),gcc)
+    CFLAGS  += -fpcc-struct-return
+  endif
+  CFLAGS  += -Wall # -pedantic
+  ifeq ($(LIBARCH),LIBC)
+    ifeq ($(POSIXFL),1)
+      PRELUDE = $(NDK_LIBC)/imports/posixpre.gcc.o
+    else
+      PRELUDE = $(NDK_LIBC)/imports/libcpre.gcc.o
+    endif
+  else
+    PRELUDE = $(NDK_CLIB)/imports/clibpre.gcc.o
+    # to avoid the __init_* / __deinit_* woes don't use prelude from NDK
+    # http://www.gknw.net/development/mk_nlm/gcc_pre.zip
+    # PRELUDE = $(NDK_ROOT)/pre/prelude.o
+    CFLAGS += -include $(NDKBASE)/nlmconv/genlm.h
+ endif
 endif
 
 NDK_ROOT = $(NDKBASE)/ndk
@@ -257,99 +257,99 @@ ENABLE_IPV6 = 1
 endif
 
 ifdef WITH_ARES
-	INCLUDES += -I$(LIBCARES_PATH)
-	LDLIBS += $(LIBCARES_PATH)/libcares.$(LIBEXT)
+  INCLUDES += -I$(LIBCARES_PATH)
+  LDLIBS += $(LIBCARES_PATH)/libcares.$(LIBEXT)
 endif
 ifdef WITH_SSH2
-	INCLUDES += -I$(LIBSSH2_PATH)/include
+  INCLUDES += -I$(LIBSSH2_PATH)/include
 ifdef LINK_STATIC
-	LDLIBS += $(LIBSSH2_PATH)/nw/libssh2.$(LIBEXT)
+  LDLIBS += $(LIBSSH2_PATH)/nw/libssh2.$(LIBEXT)
 else
-	MODULES += libssh2.nlm
-	IMPORTS += @$(LIBSSH2_PATH)/nw/libssh2.imp
+  MODULES += libssh2.nlm
+  IMPORTS += @$(LIBSSH2_PATH)/nw/libssh2.imp
 endif
 endif
 ifdef WITH_RTMP
-	INCLUDES += -I$(LIBRTMP_PATH)
-	LDLIBS += $(LIBRTMP_PATH)/librtmp/librtmp.$(LIBEXT)
+  INCLUDES += -I$(LIBRTMP_PATH)
+  LDLIBS += $(LIBRTMP_PATH)/librtmp/librtmp.$(LIBEXT)
 endif
 ifdef WITH_SSL
-	INCLUDES += -I$(OPENSSL_PATH)/outinc_nw_$(LIBARCH_L)
-	LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/ssl.$(LIBEXT)
-	LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/crypto.$(LIBEXT)
-	IMPORTS += GetProcessSwitchCount RunningProcess
-	INSTDEP += ca-bundle.crt
+  INCLUDES += -I$(OPENSSL_PATH)/outinc_nw_$(LIBARCH_L)
+  LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/ssl.$(LIBEXT)
+  LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/crypto.$(LIBEXT)
+  IMPORTS += GetProcessSwitchCount RunningProcess
+  INSTDEP += ca-bundle.crt
 else
 ifdef WITH_AXTLS
-	INCLUDES += -I$(AXTLS_PATH)/inc
-ifdef LINK_STATIC
-	LDLIBS += $(AXTLS_PATH)/lib/libaxtls.$(LIBEXT)
-else
-	MODULES += libaxtls.nlm
-	IMPORTS += $(AXTLS_PATH)/lib/libaxtls.imp
-endif
-	INSTDEP += ca-bundle.crt
+  INCLUDES += -I$(AXTLS_PATH)/inc
+  ifdef LINK_STATIC
+    LDLIBS += $(AXTLS_PATH)/lib/libaxtls.$(LIBEXT)
+  else
+    MODULES += libaxtls.nlm
+    IMPORTS += $(AXTLS_PATH)/lib/libaxtls.imp
+  endif
+  INSTDEP += ca-bundle.crt
 endif
 endif
 ifdef WITH_ZLIB
-	INCLUDES += -I$(ZLIB_PATH)
-ifdef LINK_STATIC
-	LDLIBS += $(ZLIB_PATH)/nw/$(LIBARCH)/libz.$(LIBEXT)
-else
-	MODULES += libz.nlm
-	IMPORTS += @$(ZLIB_PATH)/nw/$(LIBARCH)/libz.imp
-endif
+  INCLUDES += -I$(ZLIB_PATH)
+  ifdef LINK_STATIC
+    LDLIBS += $(ZLIB_PATH)/nw/$(LIBARCH)/libz.$(LIBEXT)
+  else
+    MODULES += libz.nlm
+    IMPORTS += @$(ZLIB_PATH)/nw/$(LIBARCH)/libz.imp
+  endif
 endif
 ifdef WITH_IDN
-	INCLUDES += -I$(LIBIDN_PATH)/include
-	LDLIBS += $(LIBIDN_PATH)/lib/libidn.$(LIBEXT)
+  INCLUDES += -I$(LIBIDN_PATH)/include
+  LDLIBS += $(LIBIDN_PATH)/lib/libidn.$(LIBEXT)
 endif
 ifdef WITH_NGHTTP2
-	INCLUDES += -I$(NGHTTP2_PATH)/include
-	LDLIBS += $(NGHTTP2_PATH)/lib/libnghttp2.$(LIBEXT)
+  INCLUDES += -I$(NGHTTP2_PATH)/include
+  LDLIBS += $(NGHTTP2_PATH)/lib/libnghttp2.$(LIBEXT)
 endif
 
 ifeq ($(LIBARCH),LIBC)
-	INCLUDES += -I$(NDK_LIBC)/include
-	# INCLUDES += -I$(NDK_LIBC)/include/nks
-	# INCLUDES += -I$(NDK_LIBC)/include/winsock
-	CFLAGS += -D_POSIX_SOURCE
+  INCLUDES += -I$(NDK_LIBC)/include
+  # INCLUDES += -I$(NDK_LIBC)/include/nks
+  # INCLUDES += -I$(NDK_LIBC)/include/winsock
+  CFLAGS += -D_POSIX_SOURCE
 else
-	INCLUDES += -I$(NDK_CLIB)/include/nlm
-	# INCLUDES += -I$(NDK_CLIB)/include/nlm/obsolete
-	# INCLUDES += -I$(NDK_CLIB)/include
+  INCLUDES += -I$(NDK_CLIB)/include/nlm
+  # INCLUDES += -I$(NDK_CLIB)/include/nlm/obsolete
+  # INCLUDES += -I$(NDK_CLIB)/include
 endif
 ifndef DISABLE_LDAP
-	INCLUDES += -I$(NDK_LDAP)/$(LIBARCH_L)/inc
+  INCLUDES += -I$(NDK_LDAP)/$(LIBARCH_L)/inc
 endif
-CFLAGS	+= $(INCLUDES)
+CFLAGS += $(INCLUDES)
 
 ifeq ($(MTSAFE),YES)
-	XDCOPT = -n
+  XDCOPT = -n
 endif
 ifeq ($(MTSAFE),NO)
-	XDCOPT = -u
+  XDCOPT = -u
 endif
 ifdef XDCOPT
-	XDCDATA = $(OBJDIR)/$(TARGET).xdc
+  XDCDATA = $(OBJDIR)/$(TARGET).xdc
 endif
 
 ifeq ($(findstring /sh,$(SHELL)),/sh)
-DL	= '
-DS	= /
-PCT	= %
+DL  = '
+DS  = /
+PCT = %
 #-include $(NDKBASE)/nlmconv/ncpfs.inc
 else
-DS	= \\
-PCT	= %%
+DS  = \\
+PCT = %%
 endif
 
 # Makefile.inc provides the CSOURCES and HHEADERS defines
 include Makefile.inc
 
-OBJS	:= $(patsubst %.c,$(OBJDIR)/%.o,$(strip $(notdir $(CSOURCES)))) $(OBJDIR)/nwos.o
+OBJS := $(patsubst %.c,$(OBJDIR)/%.o,$(strip $(notdir $(CSOURCES)))) $(OBJDIR)/nwos.o
 
-OBJL	= $(OBJS) $(OBJDIR)/nwlib.o $(LDLIBS)
+OBJL = $(OBJS) $(OBJDIR)/nwlib.o $(LDLIBS)
 
 vpath %.c . vauth vtls
 
@@ -757,4 +757,3 @@ $(LIBCARES_PATH)/libcares.$(LIBEXT):
 ca-bundle.crt: mk-ca-bundle.pl
 	@echo Creating $@
 	@-$(PERL) $< -b -n $@
-
diff --git a/lib/amigaos.h b/lib/amigaos.h
index 02bee1610..7c0926cc3 100644
--- a/lib/amigaos.h
+++ b/lib/amigaos.h
@@ -36,4 +36,3 @@ void Curl_amiga_cleanup();
 #endif
 
 #endif /* HEADER_CURL_AMIGAOS_H */
-
diff --git a/lib/config-dos.h b/lib/config-dos.h
index ff1ea1558..3e973de0b 100644
--- a/lib/config-dos.h
+++ b/lib/config-dos.h
@@ -181,4 +181,3 @@
 #undef byte
 
 #endif /* HEADER_CURL_CONFIG_DOS_H */
-
diff --git a/lib/curl_ldap.h b/lib/curl_ldap.h
index 27d03810f..94c002948 100644
--- a/lib/curl_ldap.h
+++ b/lib/curl_ldap.h
@@ -32,4 +32,3 @@ extern const struct Curl_handler Curl_handler_ldaps;
 
 #endif
 #endif /* HEADER_CURL_LDAP_H */
-
diff --git a/lib/curl_setup_once.h b/lib/curl_setup_once.h
index 6d01ea156..413ccea91 100644
--- a/lib/curl_setup_once.h
+++ b/lib/curl_setup_once.h
@@ -515,4 +515,3 @@ typedef int sig_atomic_t;
 
 
 #endif /* HEADER_CURL_SETUP_ONCE_H */
-
diff --git a/lib/curlx.h b/lib/curlx.h
index 6e418266b..4c77d4f2e 100644
--- a/lib/curlx.h
+++ b/lib/curlx.h
@@ -102,4 +102,3 @@
 #endif /* ENABLE_CURLX_PRINTF */
 
 #endif /* HEADER_CURL_CURLX_H */
-
diff --git a/lib/easy.c b/lib/easy.c
index fb9105a1c..4de4e6522 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -1212,4 +1212,3 @@ CURLcode curl_easy_upkeep(struct Curl_easy *data)
     return CURLE_OK;
   }
 }
-
diff --git a/lib/easyif.h b/lib/easyif.h
index f6132cc70..6ba7e549d 100644
--- a/lib/easyif.h
+++ b/lib/easyif.h
@@ -30,4 +30,3 @@ CURL_EXTERN CURLcode curl_easy_perform_ev(struct Curl_easy *easy);
 #endif
 
 #endif /* HEADER_CURL_EASYIF_H */
-
diff --git a/lib/escape.h b/lib/escape.h
index 666f1ad71..d8bbe5cb0 100644
--- a/lib/escape.h
+++ b/lib/escape.h
@@ -31,4 +31,3 @@ CURLcode Curl_urldecode(struct Curl_easy *data,
                         bool reject_crlf);
 
 #endif /* HEADER_CURL_ESCAPE_H */
-
diff --git a/lib/file.h b/lib/file.h
index c12ae0e09..20828ad4a 100644
--- a/lib/file.h
+++ b/lib/file.h
@@ -38,4 +38,3 @@ extern const struct Curl_handler Curl_handler_file;
 #endif
 
 #endif /* HEADER_CURL_FILE_H */
-
diff --git a/lib/firefox-db2pem.sh b/lib/firefox-db2pem.sh
index 7d691ff6b..454893244 100644
--- a/lib/firefox-db2pem.sh
+++ b/lib/firefox-db2pem.sh
@@ -51,4 +51,3 @@ while read nickname; \
  do echo $nickname | sed -e "s/Builtin Object Token://g"; \
 eval certutil -d $db -L -n "$nickname" -a ; \
 done >> $out
-
diff --git a/lib/hostcheck.h b/lib/hostcheck.h
index 86e3b96a9..f562df9ae 100644
--- a/lib/hostcheck.h
+++ b/lib/hostcheck.h
@@ -29,4 +29,3 @@
 int Curl_cert_hostcheck(const char *match_pattern, const char *hostname);
 
 #endif /* HEADER_CURL_HOSTCHECK_H */
-
diff --git a/lib/hostip.c b/lib/hostip.c
index 8d46c1d82..0dd0cbcba 100644
--- a/lib/hostip.c
+++ b/lib/hostip.c
@@ -1109,4 +1109,3 @@ CURLcode Curl_once_resolved(struct connectdata *conn,
 
   return result;
 }
-
diff --git a/lib/http.h b/lib/http.h
index c0dbc996f..21fa701ab 100644
--- a/lib/http.h
+++ b/lib/http.h
@@ -257,4 +257,3 @@ Curl_http_output_auth(struct connectdata *conn,
                                             up the proxy tunnel */
 
 #endif /* HEADER_CURL_HTTP_H */
-
diff --git a/lib/http2.h b/lib/http2.h
index 21cd9b848..4492ec211 100644
--- a/lib/http2.h
+++ b/lib/http2.h
@@ -77,4 +77,3 @@ void Curl_http2_cleanup_dependencies(struct Curl_easy *data);
 #endif
 
 #endif /* HEADER_CURL_HTTP2_H */
-
diff --git a/lib/http_chunks.h b/lib/http_chunks.h
index 3a8b4ddf3..b969c5590 100644
--- a/lib/http_chunks.h
+++ b/lib/http_chunks.h
@@ -88,4 +88,3 @@ struct Curl_chunker {
 };
 
 #endif /* HEADER_CURL_HTTP_CHUNKS_H */
-
diff --git a/lib/inet_ntop.h b/lib/inet_ntop.h
index 9f4461271..d150bb693 100644
--- a/lib/inet_ntop.h
+++ b/lib/inet_ntop.h
@@ -35,4 +35,3 @@ char *Curl_inet_ntop(int af, const void *addr, char *buf, size_t size);
 #endif
 
 #endif /* HEADER_CURL_INET_NTOP_H */
-
diff --git a/lib/inet_pton.h b/lib/inet_pton.h
index e216f4efa..0209b9b7b 100644
--- a/lib/inet_pton.h
+++ b/lib/inet_pton.h
@@ -37,4 +37,3 @@ int Curl_inet_pton(int, const char *, void *);
 #endif
 
 #endif /* HEADER_CURL_INET_PTON_H */
-
diff --git a/lib/llist.h b/lib/llist.h
index 6b644b99c..b9d4c89a9 100644
--- a/lib/llist.h
+++ b/lib/llist.h
@@ -51,4 +51,3 @@ void Curl_llist_move(struct curl_llist *, struct curl_llist_element *,
                      struct curl_llist *, struct curl_llist_element *);
 
 #endif /* HEADER_CURL_LLIST_H */
-
diff --git a/lib/makefile.amiga b/lib/makefile.amiga
index c692e5ebe..673b147c1 100644
--- a/lib/makefile.amiga
+++ b/lib/makefile.amiga
@@ -4,16 +4,16 @@
 
 # change the follow to where you have the AmiTCP SDK v4.3 includes:
 
-ATCPSDKI=	/GG/netinclude
+ATCPSDKI= /GG/netinclude
 
 
-CC	=	m68k-amigaos-gcc
-CFLAGS	=	-I$(ATCPSDKI) -m68020-60 -O2 -msoft-float -noixemul -g -I. -I../include -W -Wall
+CC = m68k-amigaos-gcc
+CFLAGS = -I$(ATCPSDKI) -m68020-60 -O2 -msoft-float -noixemul -g -I. -I../include -W -Wall
 
 include Makefile.inc
 OBJS = $(CSOURCES:.c=.o)
 
-all:	$(OBJS)
+all: $(OBJS)
 	ar cru libcurl.a $(OBJS)
 	ranlib libcurl.a
 
diff --git a/lib/makefile.dj b/lib/makefile.dj
index 8ab2d575d..941f8ce68 100644
--- a/lib/makefile.dj
+++ b/lib/makefile.dj
@@ -69,4 +69,3 @@ realclean vclean: clean
 	- $(DELETE) $(CURL_LIB)
 
 -include depend.dj
-
diff --git a/lib/nonblock.h b/lib/nonblock.h
index 98cdc25ab..eb18ea1c3 100644
--- a/lib/nonblock.h
+++ b/lib/nonblock.h
@@ -28,4 +28,3 @@ int curlx_nonblock(curl_socket_t sockfd,    /* operate on this */
                    int nonblock   /* TRUE or FALSE */);
 
 #endif /* HEADER_CURL_NONBLOCK_H */
-
diff --git a/lib/parsedate.h b/lib/parsedate.h
index 2e59eb17c..8dc3b90ec 100644
--- a/lib/parsedate.h
+++ b/lib/parsedate.h
@@ -28,4 +28,3 @@ extern const char * const Curl_month[12];
 CURLcode Curl_gmtime(time_t intime, struct tm *store);
 
 #endif /* HEADER_CURL_PARSEDATE_H */
-
diff --git a/lib/progress.h b/lib/progress.h
index 92dbcbd9a..3515ac6d5 100644
--- a/lib/progress.h
+++ b/lib/progress.h
@@ -62,4 +62,3 @@ timediff_t Curl_pgrsLimitWaitTime(curl_off_t cursize,
 #define PGRS_HEADERS_OUT (1<<7) /* set when the headers have been written */
 
 #endif /* HEADER_CURL_PROGRESS_H */
-
diff --git a/lib/rtsp.h b/lib/rtsp.h
index 8375a5317..2f9cc32c8 100644
--- a/lib/rtsp.h
+++ b/lib/rtsp.h
@@ -64,4 +64,3 @@ struct RTSP {
 
 
 #endif /* HEADER_CURL_RTSP_H */
-
diff --git a/lib/select.h b/lib/select.h
index 4351786c3..9a1ba45a7 100644
--- a/lib/select.h
+++ b/lib/select.h
@@ -113,4 +113,3 @@ int tpf_select_libcurl(int maxfds, fd_set* reads, fd_set* writes,
 #endif
 
 #endif /* HEADER_CURL_SELECT_H */
-
diff --git a/lib/slist.c b/lib/slist.c
index e5adc0e71..392b84d13 100644
--- a/lib/slist.c
+++ b/lib/slist.c
@@ -142,4 +142,3 @@ void curl_slist_free_all(struct curl_slist *list)
     item = next;
   } while(next);
 }
-
diff --git a/lib/slist.h b/lib/slist.h
index b3f498c35..d73dbf672 100644
--- a/lib/slist.h
+++ b/lib/slist.h
@@ -37,4 +37,3 @@ struct curl_slist *Curl_slist_append_nodup(struct curl_slist *list,
                                            char *data);
 
 #endif /* HEADER_CURL_SLIST_H */
-
diff --git a/lib/sockaddr.h b/lib/sockaddr.h
index 95ba4c3c9..db146803a 100644
--- a/lib/sockaddr.h
+++ b/lib/sockaddr.h
@@ -40,4 +40,3 @@ struct Curl_sockaddr_storage {
 };
 
 #endif /* HEADER_CURL_SOCKADDR_H */
-
diff --git a/lib/socks.c b/lib/socks.c
index 0d4d856aa..d2209ad89 100644
--- a/lib/socks.c
+++ b/lib/socks.c
@@ -789,4 +789,3 @@ CURLcode Curl_SOCKS5(const char *proxy_user,
 }
 
 #endif /* CURL_DISABLE_PROXY */
-
diff --git a/lib/socks.h b/lib/socks.h
index 348707e74..daa07c127 100644
--- a/lib/socks.h
+++ b/lib/socks.h
@@ -73,4 +73,3 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
 #endif /* CURL_DISABLE_PROXY */
 
 #endif  /* HEADER_CURL_SOCKS_H */
-
diff --git a/lib/splay.c b/lib/splay.c
index c54a63bba..baf07e00d 100644
--- a/lib/splay.c
+++ b/lib/splay.c
@@ -274,4 +274,3 @@ int Curl_splayremovebyaddr(struct Curl_tree *t,
 
   return 0;
 }
-
diff --git a/lib/telnet.h b/lib/telnet.h
index 419a399b7..668a78a13 100644
--- a/lib/telnet.h
+++ b/lib/telnet.h
@@ -26,4 +26,3 @@ extern const struct Curl_handler Curl_handler_telnet;
 #endif
 
 #endif /* HEADER_CURL_TELNET_H */
-
diff --git a/lib/tftp.h b/lib/tftp.h
index c2325b232..1335f64bd 100644
--- a/lib/tftp.h
+++ b/lib/tftp.h
@@ -26,4 +26,3 @@ extern const struct Curl_handler Curl_handler_tftp;
 #endif
 
 #endif /* HEADER_CURL_TFTP_H */
-
diff --git a/lib/transfer.h b/lib/transfer.h
index 9263e5b69..9742455ae 100644
--- a/lib/transfer.h
+++ b/lib/transfer.h
@@ -71,4 +71,3 @@ Curl_setup_transfer (struct connectdata *data,
 );
 
 #endif /* HEADER_CURL_TRANSFER_H */
-
diff --git a/lib/vtls/axtls.h b/lib/vtls/axtls.h
index 3f1e129c2..cb8187272 100644
--- a/lib/vtls/axtls.h
+++ b/lib/vtls/axtls.h
@@ -31,4 +31,3 @@ extern const struct Curl_ssl Curl_ssl_axtls;
 
 #endif /* USE_AXTLS */
 #endif /* HEADER_CURL_AXTLS_H */
-
diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4
index b90e44d98..3b174abc3 100644
--- a/m4/curl-compilers.m4
+++ b/m4/curl-compilers.m4
@@ -1633,4 +1633,3 @@ AC_DEFUN([CURL_VAR_STRIP], [
   [$1]="$ac_var_stripped"
   squeeze [$1]
 ])
-
diff --git a/m4/curl-confopts.m4 b/m4/curl-confopts.m4
index e591caa58..a0f477aad 100644
--- a/m4/curl-confopts.m4
+++ b/m4/curl-confopts.m4
@@ -350,7 +350,6 @@ AC_DEFUN([CURL_CHECK_OPTION_RT], [
       ;;
   esac
 ])
- 
 
 dnl CURL_CHECK_OPTION_WARNINGS
 dnl -------------------------------------------------
@@ -649,4 +648,3 @@ AC_DEFUN([CURL_CHECK_NTLM_WB], [
     NTLM_WB_ENABLED=1
   fi
 ])
-
diff --git a/m4/curl-override.m4 b/m4/curl-override.m4
index b27cb6111..a03504982 100644
--- a/m4/curl-override.m4
+++ b/m4/curl-override.m4
@@ -73,4 +73,3 @@ char $1 ();
 choke me
 #endif
 ], [return $1 ();])])
-
diff --git a/m4/curl-reentrant.m4 b/m4/curl-reentrant.m4
index e32d3f8a7..8b5ca124b 100644
--- a/m4/curl-reentrant.m4
+++ b/m4/curl-reentrant.m4
@@ -614,4 +614,3 @@ AC_DEFUN([CURL_CONFIGURE_THREAD_SAFE], [
   fi
   #
 ])
-
diff --git a/m4/xc-am-iface.m4 b/m4/xc-am-iface.m4
index 1571c211f..8fc2ea869 100644
--- a/m4/xc-am-iface.m4
+++ b/m4/xc-am-iface.m4
@@ -250,4 +250,3 @@ _XC_AMEND_DISTCLEAN_BODY([$1])
 ])dnl
 m4_define([$0], [])[]dnl
 ])
-
diff --git a/m4/xc-cc-check.m4 b/m4/xc-cc-check.m4
index 777decf29..f95f25933 100644
--- a/m4/xc-cc-check.m4
+++ b/m4/xc-cc-check.m4
@@ -93,4 +93,3 @@ AC_DEFUN([XC_CHECK_PROG_CC], [
   AC_BEFORE([$0],[_XC_PROG_CC_POSTLUDE])dnl
   AC_REQUIRE([_XC_PROG_CC])dnl
 ])
-
diff --git a/m4/xc-lt-iface.m4 b/m4/xc-lt-iface.m4
index ec903f575..afbd990d6 100644
--- a/m4/xc-lt-iface.m4
+++ b/m4/xc-lt-iface.m4
@@ -462,4 +462,3 @@ m4_ifdef([LT_INIT],
 dnl
 m4_define([$0],[])dnl
 ])
-
diff --git a/m4/xc-translit.m4 b/m4/xc-translit.m4
index 1918f1684..456e72782 100644
--- a/m4/xc-translit.m4
+++ b/m4/xc-translit.m4
@@ -161,4 +161,3 @@ dnl Expands to quoted result of 'translit' expansion.
 
 AC_DEFUN([XC_QTRANSLIT],
 [XC_QUOTE(translit([$1], [$2], [$3]))])
-
diff --git a/m4/xc-val-flgs.m4 b/m4/xc-val-flgs.m4
index 36b432c93..95b450b23 100644
--- a/m4/xc-val-flgs.m4
+++ b/m4/xc-val-flgs.m4
@@ -240,4 +240,3 @@ AC_DEFUN([XC_CHECK_BUILD_FLAGS], [
      AC_MSG_WARN([Continuing even with errors mentioned immediately above this line.])
   fi
 ])
-
diff --git a/m4/zz40-xc-ovr.m4 b/m4/zz40-xc-ovr.m4
index 3d6e695f3..14c92d8c1 100644
--- a/m4/zz40-xc-ovr.m4
+++ b/m4/zz40-xc-ovr.m4
@@ -663,4 +663,3 @@ dnl
 m4_pattern_forbid([^_*XC])dnl
 m4_define([$0],[])dnl
 ])
-
diff --git a/m4/zz50-xc-ovr.m4 b/m4/zz50-xc-ovr.m4
index de0c84310..7f530dead 100644
--- a/m4/zz50-xc-ovr.m4
+++ b/m4/zz50-xc-ovr.m4
@@ -57,4 +57,3 @@ dnl provided elsewhere.
 
 AC_DEFUN([XC_OVR_ZZ50],
   [AC_BEFORE([$0],[AC_PROG_LIBTOOL])])
-
diff --git a/m4/zz60-xc-ovr.m4 b/m4/zz60-xc-ovr.m4
index 959f11883..45ed8b69a 100644
--- a/m4/zz60-xc-ovr.m4
+++ b/m4/zz60-xc-ovr.m4
@@ -61,4 +61,3 @@ dnl
 AC_BEFORE([$0],[AC_CONFIG_MACRO_DIR])dnl
 AC_BEFORE([$0],[AC_CONFIG_MACRO_DIRS])dnl
 ])
-
diff --git a/packages/AIX/RPM/Makefile.am b/packages/AIX/RPM/Makefile.am
index d1e7bf9d9..71e854ff8 100644
--- a/packages/AIX/RPM/Makefile.am
+++ b/packages/AIX/RPM/Makefile.am
@@ -1,2 +1 @@
 EXTRA_DIST = README curl.spec.in
-
diff --git a/packages/Android/Android.mk b/packages/Android/Android.mk
index 72f5e231f..6a2ebff68 100644
--- a/packages/Android/Android.mk
+++ b/packages/Android/Android.mk
@@ -59,14 +59,14 @@ common_CFLAGS := -Wpointer-arith -Wwrite-strings -Wunused -Winline -Wnested-exte
 include $(CLEAR_VARS)
 include $(LOCAL_PATH)/lib/Makefile.inc
 CURL_HEADERS := \
-	curl.h \
-	system.h \
-	curlver.h \
-	easy.h \
-	mprintf.h \
-	multi.h \
-	stdcheaders.h \
-	typecheck-gcc.h
+  curl.h \
+  system.h \
+  curlver.h \
+  easy.h \
+  mprintf.h \
+  multi.h \
+  stdcheaders.h \
+  typecheck-gcc.h
 
 LOCAL_SRC_FILES := $(addprefix lib/,$(CSOURCES))
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/include/
@@ -108,4 +108,3 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/include $(LOCAL_PATH)/lib
 LOCAL_CFLAGS += $(common_CFLAGS)
 
 include $(BUILD_EXECUTABLE)
-
diff --git a/packages/Linux/RPM/Makefile.am b/packages/Linux/RPM/Makefile.am
index 5d46d87c6..89f43d5e8 100644
--- a/packages/Linux/RPM/Makefile.am
+++ b/packages/Linux/RPM/Makefile.am
@@ -1,2 +1 @@
 EXTRA_DIST = README curl-ssl.spec.in curl.spec.in make_curl_rpm
-
diff --git a/packages/Linux/RPM/README b/packages/Linux/RPM/README
index a48ece043..a6936ba56 100644
--- a/packages/Linux/RPM/README
+++ b/packages/Linux/RPM/README
@@ -2,4 +2,3 @@ Author: Daniel (I'm not trustworthy, replace this!)
 
 Paul Marquis's 'make_curl_rpm' script is a fine example on how to automate the
 jobs. You need to fill in your own name and email at least.
-
diff --git a/packages/Linux/RPM/curl.spec.in b/packages/Linux/RPM/curl.spec.in
index 59577b04f..7d0b91800 100644
--- a/packages/Linux/RPM/curl.spec.in
+++ b/packages/Linux/RPM/curl.spec.in
@@ -81,4 +81,3 @@ rm -rf %{builddir}
 
         - use _mandir instead of prefix to locate man pages because
 	  _mandir is not always prefix/man/man?.
-
diff --git a/packages/Makefile.am b/packages/Makefile.am
index 98fcc1d77..b2e7228c9 100644
--- a/packages/Makefile.am
+++ b/packages/Makefile.am
@@ -1,33 +1,33 @@
 SUBDIRS = Win32 Linux Solaris AIX vms
 
-EXTRA_DIST = README 			\
-	DOS/README 			\
-	DOS/common.dj 			\
-	NetWare/get_ver.awk 		\
-	NetWare/get_exp.awk 		\
-	OS400/README.OS400 		\
-	OS400/ccsidcurl.c 		\
-	OS400/ccsidcurl.h 		\
-	OS400/curl.inc.in 		\
-	OS400/initscript.sh 		\
-	OS400/make-include.sh 		\
-	OS400/make-lib.sh 		\
-	OS400/make-src.sh 		\
-	OS400/make-tests.sh 		\
-	OS400/makefile.sh 		\
-	OS400/os400sys.c 		\
-	OS400/os400sys.h 		\
-	Symbian/bwins/libcurlu.def 	\
-	Symbian/eabi/libcurlu.def 	\
-	Symbian/group/bld.inf 		\
-	Symbian/group/curl.iby 		\
-	Symbian/group/curl.mmp 		\
-	Symbian/group/curl.pkg 		\
-	Symbian/group/libcurl.iby 	\
-	Symbian/group/libcurl.mmp 	\
-	Symbian/group/libcurl.pkg 	\
-	Symbian/readme.txt 		\
-	TPF/curl.mak 			\
-	TPF/maketpf.env_curl 		\
-	TPF/maketpf.env_curllib         \
-	Android/Android.mk
+EXTRA_DIST = README \
+  DOS/README \
+  DOS/common.dj \
+  NetWare/get_ver.awk \
+  NetWare/get_exp.awk \
+  OS400/README.OS400 \
+  OS400/ccsidcurl.c \
+  OS400/ccsidcurl.h \
+  OS400/curl.inc.in \
+  OS400/initscript.sh \
+  OS400/make-include.sh \
+  OS400/make-lib.sh \
+  OS400/make-src.sh \
+  OS400/make-tests.sh \
+  OS400/makefile.sh \
+  OS400/os400sys.c \
+  OS400/os400sys.h \
+  Symbian/bwins/libcurlu.def \
+  Symbian/eabi/libcurlu.def \
+  Symbian/group/bld.inf \
+  Symbian/group/curl.iby \
+  Symbian/group/curl.mmp \
+  Symbian/group/curl.pkg \
+  Symbian/group/libcurl.iby \
+  Symbian/group/libcurl.mmp \
+  Symbian/group/libcurl.pkg \
+  Symbian/readme.txt \
+  TPF/curl.mak \
+  TPF/maketpf.env_curl \
+  TPF/maketpf.env_curllib \
+  Android/Android.mk
diff --git a/packages/NetWare/get_exp.awk b/packages/NetWare/get_exp.awk
index 566e891e0..9bbb012ac 100644
--- a/packages/NetWare/get_exp.awk
+++ b/packages/NetWare/get_exp.awk
@@ -69,4 +69,3 @@ END {
   }
   printf(" %s\n", exports[++x])
 }
-
diff --git a/packages/NetWare/get_ver.awk b/packages/NetWare/get_ver.awk
index 03ee5ec62..2db2be98f 100644
--- a/packages/NetWare/get_ver.awk
+++ b/packages/NetWare/get_ver.awk
@@ -41,4 +41,3 @@ BEGIN {
   print "LIBCURL_VERSION_STR = " version_string
   print "LIBCURL_COPYRIGHT_STR = " copyright_string
 }
-
diff --git a/packages/Symbian/bwins/libcurlu.def b/packages/Symbian/bwins/libcurlu.def
index 035df1352..7f30b7feb 100644
--- a/packages/Symbian/bwins/libcurlu.def
+++ b/packages/Symbian/bwins/libcurlu.def
@@ -58,4 +58,3 @@ EXPORTS
 	curl_easy_recv @ 57 NONAME
 	curl_easy_send @ 58 NONAME
 	curl_multi_wait @ 59 NONAME
-
diff --git a/packages/Symbian/eabi/libcurlu.def b/packages/Symbian/eabi/libcurlu.def
index 035df1352..7f30b7feb 100644
--- a/packages/Symbian/eabi/libcurlu.def
+++ b/packages/Symbian/eabi/libcurlu.def
@@ -58,4 +58,3 @@ EXPORTS
 	curl_easy_recv @ 57 NONAME
 	curl_easy_send @ 58 NONAME
 	curl_multi_wait @ 59 NONAME
-
diff --git a/packages/Symbian/group/curl.mmp b/packages/Symbian/group/curl.mmp
index 4b304a3d9..14ccf1419 100644
--- a/packages/Symbian/group/curl.mmp
+++ b/packages/Symbian/group/curl.mmp
@@ -61,4 +61,3 @@ STATICLIBRARY libcrt0.lib
 CAPABILITY NetworkServices
 
 EPOCSTACKSIZE 0x8000
-
diff --git a/packages/TPF/curl.mak b/packages/TPF/curl.mak
index 5ef2ae16d..176abec24 100644
--- a/packages/TPF/curl.mak
+++ b/packages/TPF/curl.mak
@@ -57,4 +57,3 @@ CFLAGS_CURL += -DCURL_DISABLE_TFTP
 #######################################################################
 
 include maketpf.rules
-
diff --git a/packages/TPF/maketpf.env_curl b/packages/TPF/maketpf.env_curl
index 91a2573a1..3ebf1d189 100644
--- a/packages/TPF/maketpf.env_curl
+++ b/packages/TPF/maketpf.env_curl
@@ -22,4 +22,3 @@ ROOTINCDIRS += $(foreach d,$(TPF_ROOT_LM),$d/opensource/curl/include/curl)
 ################################################################################
 
 CFLAGS_$(APP) += -D TPF
-
diff --git a/packages/TPF/maketpf.env_curllib b/packages/TPF/maketpf.env_curllib
index f6ad5ba9d..30cc3169e 100644
--- a/packages/TPF/maketpf.env_curllib
+++ b/packages/TPF/maketpf.env_curllib
@@ -54,4 +54,3 @@ ROOTCDIRS := $(foreach d,$(TPF_ROOT_LM),$d/opensource/curl/lib)
 ################################################################################
 
 CFLAGS_$(APP) += -D TPF
-
diff --git a/packages/Win32/README b/packages/Win32/README
index b37b57532..f21967431 100644
--- a/packages/Win32/README
+++ b/packages/Win32/README
@@ -1,4 +1,4 @@
-Author: J�rn Hartroth
+Author: Jörn Hartroth
 
 DESCRIPTION
 
diff --git a/packages/vms/gnv_conftest.c_first b/packages/vms/gnv_conftest.c_first
index 8645b0e37..f47469c5b 100644
--- a/packages/vms/gnv_conftest.c_first
+++ b/packages/vms/gnv_conftest.c_first
@@ -58,4 +58,3 @@ char ENGINE_load_builtin_engines (void) {return 0;}
  * it turns out that VMS does not have the CRYPTO_LOCK symbol in the
  * transfer vector, even though it is in the header file.
  */
-
diff --git a/projects/build-openssl.bat b/projects/build-openssl.bat
index 98daff529..96fccf87a 100644
--- a/projects/build-openssl.bat
+++ b/projects/build-openssl.bat
@@ -110,23 +110,23 @@ rem ***************************************************************************
   ) else if /i "%~1" == "-help" (
     goto syntax
   ) else if /i "%~1" == "-VSpath" (
-	if "%~2" == "" (
-		echo.
-		echo Error. Please provide VS Path.
-		goto error
-	) else ( 
-		set "ABS_VC_PATH=%~2\VC"
-		shift
-	)
+    if "%~2" == "" (
+      echo.
+      echo Error. Please provide VS Path.
+      goto error
+    ) else (
+      set "ABS_VC_PATH=%~2\VC"
+      shift
+    )
   ) else if /i "%~1" == "-perlpath" (
     if "%~2" == "" (
-		echo.
-		echo Error. Please provide Perl root Path.
-		goto error
-	) else (		
-		set "PERL_PATH=%~2"
-		shift
-	)
+      echo.
+      echo Error. Please provide Perl root Path.
+      goto error
+    ) else (
+      set "PERL_PATH=%~2"
+      shift
+    )
   ) else (
     if not defined START_DIR (
       set START_DIR=%~1%
@@ -144,12 +144,12 @@ rem ***************************************************************************
   rem Default the start directory if one isn't specified
   if not defined START_DIR set START_DIR=..\..\openssl
 
-  if not defined ABS_VC_PATH ( 
+  if not defined ABS_VC_PATH (
     rem Check we have a program files directory
-	if not defined PF goto nopf
-	set "ABS_VC_PATH=%PF%\%VC_PATH%"
+    if not defined PF goto nopf
+    set "ABS_VC_PATH=%PF%\%VC_PATH%"
   )
-  
+
   rem Check we have Visual Studio installed
   if not exist "%ABS_VC_PATH%" goto novc
 
@@ -260,17 +260,17 @@ rem ***************************************************************************
   rem Move the PDB files
   move tmp32.dbg\lib.pdb "%OUTDIR%\LIB Debug" 1>nul
   move tmp32dll.dbg\lib.pdb "%OUTDIR%\DLL Debug" 1>nul
-  
+
   rem Remove the intermediate directories
   rd tmp32.dbg /s /q
   rd tmp32dll.dbg /s /q
 
   if "%BUILD_CONFIG%" == "debug" goto success
-  
+
 :x64release
   rem Configuring 64-bit Release Build
   perl Configure VC-WIN64A --prefix=%CD%
-  
+
   rem Perform the build
   call ms\do_win64a
   nmake -f ms\nt.mak
@@ -299,14 +299,14 @@ rem ***************************************************************************
   rd tmp32dll /s /q
 
   goto success
-  
+
 :x86
   rem Calculate our output directory
   set OUTDIR=build\Win32\%VC_DESC%
   if not exist %OUTDIR% md %OUTDIR%
 
   if "%BUILD_CONFIG%" == "release" goto x86release
-  
+
 :x86debug
   rem Configuring 32-bit Debug Build
   perl Configure debug-VC-WIN32 no-asm --prefix=%CD%
@@ -339,7 +339,7 @@ rem ***************************************************************************
   rd tmp32dll.dbg /s /q
 
   if "%BUILD_CONFIG%" == "debug" goto success
-  
+
 :x86release
   rem Configuring 32-bit Release Build
   perl Configure VC-WIN32 no-asm --prefix=%CD%
@@ -405,13 +405,13 @@ rem ***************************************************************************
   echo.
   echo directory - Specifies the OpenSSL source directory
   echo.
-  echo -VSpath - Specify the custom VS path if Visual Studio is installed at other location 
+  echo -VSpath - Specify the custom VS path if Visual Studio is installed at other location
   echo           then "C:/<ProgramFiles>/Microsoft Visual Studio[version]
   echo           For e.g. -VSpath "C:\apps\MVS14"
   echo.
   echo -perlpath - Specify the custom perl root path if perl is not located at "C:\Perl" and it is a
   echo             portable copy of perl and not installed on the win system
-  echo			   For e.g. -perlpath "D:\strawberry-perl-5.24.3.1-64bit-portable"
+  echo             For e.g. -perlpath "D:\strawberry-perl-5.24.3.1-64bit-portable"
   goto error
 
 :unknown
diff --git a/projects/generate.bat b/projects/generate.bat
index d1fc6088c..32a88f51b 100644
--- a/projects/generate.bat
+++ b/projects/generate.bat
@@ -77,7 +77,7 @@ rem ***************************************************************************
   )
 
   shift & goto parseArgs
- 
+
 :start
   if exist ..\buildconf.bat (
     if "%MODE%" == "GENERATE" (
@@ -264,7 +264,7 @@ rem
     exit /B
   )
 
-  if exist %3 (  
+  if exist %3 (
     del %3
   )
 
@@ -391,7 +391,7 @@ rem
 :clean
   echo * %CD%\%1
 
-  if exist %1 (  
+  if exist %1 (
     del %1
   )
 
diff --git a/projects/wolfssl_options.h b/projects/wolfssl_options.h
index 04ac8da64..946e1000d 100644
--- a/projects/wolfssl_options.h
+++ b/projects/wolfssl_options.h
@@ -221,4 +221,3 @@ functioning correctly yet. https://github.com/wolfSSL/wolfssl/pull/943
 
 
 #endif /* WOLFSSL_OPTIONS_H */
-
diff --git a/scripts/log2changes.pl b/scripts/log2changes.pl
index f3454b01f..3aa326a07 100755
--- a/scripts/log2changes.pl
+++ b/scripts/log2changes.pl
@@ -14,7 +14,7 @@ sub nicedate {
     return $date;
 }
 
-print 
+print
 '                                  _   _ ____  _
                               ___| | | |  _ \| |
                              / __| | | | |_) | |
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fce2d2d25..d3ea3e23b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -83,4 +83,3 @@ install(EXPORT curl-target
         NAMESPACE CURL::
         DESTINATION ${CURL_INSTALL_CMAKE_DIR}
 )
-
diff --git a/src/Makefile.am b/src/Makefile.am
index 2efc4e3e8..80cbce206 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -88,9 +88,9 @@ CLEANFILES = tool_hugehelp.c
 # embedded text.
 NROFF=env LC_ALL=C @NROFF@ @MANOPT@ # figured out by the configure script
 
-EXTRA_DIST = mkhelp.pl makefile.dj                      		\
- Makefile.m32 macos/curl.mcp.xml.sit.hqx macos/MACINSTALL.TXT		\
- macos/src/curl_GUSIConfig.cpp macos/src/macos_main.cpp makefile.amiga	\
+EXTRA_DIST = mkhelp.pl makefile.dj                                     \
+ Makefile.m32 macos/curl.mcp.xml.sit.hqx macos/MACINSTALL.TXT          \
+ macos/src/curl_GUSIConfig.cpp macos/src/macos_main.cpp makefile.amiga \
  curl.rc Makefile.netware Makefile.inc Makefile.Watcom CMakeLists.txt
 
 # Use absolute directory to disable VPATH
diff --git a/src/Makefile.inc b/src/Makefile.inc
index e0506c7f5..e1e8306bd 100644
--- a/src/Makefile.inc
+++ b/src/Makefile.inc
@@ -10,102 +10,102 @@
 # libcurl has sources that provide functions named curlx_* that aren't part of
 # the official API, but we re-use the code here to avoid duplication.
 CURLX_CFILES = \
-	../lib/strtoofft.c \
-	../lib/nonblock.c \
-	../lib/warnless.c \
-        ../lib/curl_ctype.c
+  ../lib/strtoofft.c \
+  ../lib/nonblock.c \
+  ../lib/warnless.c \
+  ../lib/curl_ctype.c
 
 CURLX_HFILES = \
-	../lib/curl_setup.h \
-	../lib/strtoofft.h \
-	../lib/nonblock.h \
-	../lib/warnless.h \
-        ../lib/curl_ctype.h
+  ../lib/curl_setup.h \
+  ../lib/strtoofft.h \
+  ../lib/nonblock.h \
+  ../lib/warnless.h \
+  ../lib/curl_ctype.h
 
 CURL_CFILES = \
-	slist_wc.c \
-	tool_binmode.c \
-	tool_bname.c \
-	tool_cb_dbg.c \
-	tool_cb_hdr.c \
-	tool_cb_prg.c \
-	tool_cb_rea.c \
-	tool_cb_see.c \
-	tool_cb_wrt.c \
-	tool_cfgable.c \
-	tool_convert.c \
-	tool_dirhie.c \
-	tool_doswin.c \
-	tool_easysrc.c \
-	tool_filetime.c \
-	tool_formparse.c \
-	tool_getparam.c \
-	tool_getpass.c \
-	tool_help.c \
-	tool_helpers.c \
-	tool_homedir.c \
-	tool_hugehelp.c \
-	tool_libinfo.c \
-	tool_main.c \
-	tool_metalink.c \
-	tool_msgs.c \
-	tool_operate.c \
-	tool_operhlp.c \
-	tool_panykey.c \
-	tool_paramhlp.c \
-	tool_parsecfg.c \
-	tool_strdup.c \
-	tool_setopt.c \
-	tool_sleep.c \
-	tool_urlglob.c \
-	tool_util.c \
-	tool_vms.c \
-	tool_writeout.c \
-	tool_xattr.c
+  slist_wc.c \
+  tool_binmode.c \
+  tool_bname.c \
+  tool_cb_dbg.c \
+  tool_cb_hdr.c \
+  tool_cb_prg.c \
+  tool_cb_rea.c \
+  tool_cb_see.c \
+  tool_cb_wrt.c \
+  tool_cfgable.c \
+  tool_convert.c \
+  tool_dirhie.c \
+  tool_doswin.c \
+  tool_easysrc.c \
+  tool_filetime.c \
+  tool_formparse.c \
+  tool_getparam.c \
+  tool_getpass.c \
+  tool_help.c \
+  tool_helpers.c \
+  tool_homedir.c \
+  tool_hugehelp.c \
+  tool_libinfo.c \
+  tool_main.c \
+  tool_metalink.c \
+  tool_msgs.c \
+  tool_operate.c \
+  tool_operhlp.c \
+  tool_panykey.c \
+  tool_paramhlp.c \
+  tool_parsecfg.c \
+  tool_strdup.c \
+  tool_setopt.c \
+  tool_sleep.c \
+  tool_urlglob.c \
+  tool_util.c \
+  tool_vms.c \
+  tool_writeout.c \
+  tool_xattr.c
 
 CURL_HFILES = \
-	slist_wc.h \
-	tool_binmode.h \
-	tool_bname.h \
-	tool_cb_dbg.h \
-	tool_cb_hdr.h \
-	tool_cb_prg.h \
-	tool_cb_rea.h \
-	tool_cb_see.h \
-	tool_cb_wrt.h \
-	tool_cfgable.h \
-	tool_convert.h \
-	tool_dirhie.h \
-	tool_doswin.h \
-	tool_easysrc.h \
-	tool_filetime.h \
-	tool_formparse.h \
-	tool_getparam.h \
-	tool_getpass.h \
-	tool_help.h \
-	tool_helpers.h \
-	tool_homedir.h \
-	tool_hugehelp.h \
-	tool_libinfo.h \
-	tool_main.h \
-	tool_metalink.h \
-	tool_msgs.h \
-	tool_operate.h \
-	tool_operhlp.h \
-	tool_panykey.h \
-	tool_paramhlp.h \
-	tool_parsecfg.h \
-	tool_sdecls.h \
-	tool_setopt.h \
-	tool_setup.h \
-	tool_sleep.h \
-	tool_strdup.h \
-	tool_urlglob.h \
-	tool_util.h \
-	tool_version.h \
-	tool_vms.h \
-	tool_writeout.h \
-	tool_xattr.h
+  slist_wc.h \
+  tool_binmode.h \
+  tool_bname.h \
+  tool_cb_dbg.h \
+  tool_cb_hdr.h \
+  tool_cb_prg.h \
+  tool_cb_rea.h \
+  tool_cb_see.h \
+  tool_cb_wrt.h \
+  tool_cfgable.h \
+  tool_convert.h \
+  tool_dirhie.h \
+  tool_doswin.h \
+  tool_easysrc.h \
+  tool_filetime.h \
+  tool_formparse.h \
+  tool_getparam.h \
+  tool_getpass.h \
+  tool_help.h \
+  tool_helpers.h \
+  tool_homedir.h \
+  tool_hugehelp.h \
+  tool_libinfo.h \
+  tool_main.h \
+  tool_metalink.h \
+  tool_msgs.h \
+  tool_operate.h \
+  tool_operhlp.h \
+  tool_panykey.h \
+  tool_paramhlp.h \
+  tool_parsecfg.h \
+  tool_sdecls.h \
+  tool_setopt.h \
+  tool_setup.h \
+  tool_sleep.h \
+  tool_strdup.h \
+  tool_urlglob.h \
+  tool_util.h \
+  tool_version.h \
+  tool_vms.h \
+  tool_writeout.h \
+  tool_xattr.h
 
 CURL_RCFILES = curl.rc
 
diff --git a/src/Makefile.m32 b/src/Makefile.m32
index 33e4ecfc2..e13db04b9 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -100,15 +100,15 @@ ifeq ($(CURL_AR),)
 CURL_AR := $(CROSSPREFIX)ar
 endif
 
-CC	= $(CURL_CC)
-CFLAGS	= $(CURL_CFLAG_EXTRAS) -g -O2 -Wall -W
-CFLAGS	+= -fno-strict-aliasing
+CC = $(CURL_CC)
+CFLAGS = $(CURL_CFLAG_EXTRAS) -g -O2 -Wall -W
+CFLAGS += -fno-strict-aliasing
 # comment LDFLAGS below to keep debug info
-LDFLAGS	= $(CURL_LDFLAG_EXTRAS) $(CURL_LDFLAG_EXTRAS_EXE) -s
-AR	= $(CURL_AR)
-RC	= $(CROSSPREFIX)windres
-RCFLAGS	= --include-dir=$(PROOT)/include -O COFF -DCURL_EMBED_MANIFEST
-STRIP	= $(CROSSPREFIX)strip -g
+LDFLAGS = $(CURL_LDFLAG_EXTRAS) $(CURL_LDFLAG_EXTRAS_EXE) -s
+AR = $(CURL_AR)
+RC = $(CROSSPREFIX)windres
+RCFLAGS = --include-dir=$(PROOT)/include -O COFF -DCURL_EMBED_MANIFEST
+STRIP   = $(CROSSPREFIX)strip -g
 
 # We may need these someday
 # PERL = perl
@@ -117,9 +117,9 @@ STRIP	= $(CROSSPREFIX)strip -g
 # Set environment var ARCH to your architecture to override autodetection.
 ifndef ARCH
 ifeq ($(findstring x86_64,$(shell $(CC) -dumpmachine)),x86_64)
-ARCH	= w64
+ARCH = w64
 else
-ARCH	= w32
+ARCH = w32
 endif
 endif
 
@@ -135,30 +135,30 @@ endif
 
 # Platform-dependent helper tool macros
 ifeq ($(findstring /sh,$(SHELL)),/sh)
-DEL	= rm -f $1
-RMDIR	= rm -fr $1
-MKDIR	= mkdir -p $1
-COPY	= -cp -afv $1 $2
-#COPYR	= -cp -afr $1/* $2
-COPYR	= -rsync -aC $1/* $2
-TOUCH	= touch $1
-CAT	= cat
-ECHONL	= echo ""
-DL	= '
+DEL     = rm -f $1
+RMDIR   = rm -fr $1
+MKDIR   = mkdir -p $1
+COPY    = -cp -afv $1 $2
+#COPYR  = -cp -afr $1/* $2
+COPYR   = -rsync -aC $1/* $2
+TOUCH   = touch $1
+CAT     = cat
+ECHONL  = echo ""
+DL = '
 else
 ifeq "$(OS)" "Windows_NT"
-DEL	= -del 2>NUL /q /f $(subst /,\,$1)
-RMDIR	= -rd 2>NUL /q /s $(subst /,\,$1)
+DEL     = -del 2>NUL /q /f $(subst /,\,$1)
+RMDIR   = -rd 2>NUL /q /s $(subst /,\,$1)
 else
-DEL	= -del 2>NUL $(subst /,\,$1)
-RMDIR	= -deltree 2>NUL /y $(subst /,\,$1)
-endif
-MKDIR	= -md 2>NUL $(subst /,\,$1)
-COPY	= -copy 2>NUL /y $(subst /,\,$1) $(subst /,\,$2)
-COPYR	= -xcopy 2>NUL /q /y /e $(subst /,\,$1) $(subst /,\,$2)
-TOUCH	= copy 2>&1>NUL /b $(subst /,\,$1) +,,
-CAT	= type
-ECHONL	= $(ComSpec) /c echo.
+DEL     = -del 2>NUL $(subst /,\,$1)
+RMDIR   = -deltree 2>NUL /y $(subst /,\,$1)
+endif
+MKDIR   = -md 2>NUL $(subst /,\,$1)
+COPY    = -copy 2>NUL /y $(subst /,\,$1) $(subst /,\,$2)
+COPYR   = -xcopy 2>NUL /q /y /e $(subst /,\,$1) $(subst /,\,$2)
+TOUCH   = copy 2>&1>NUL /b $(subst /,\,$1) +,,
+CAT     = type
+ECHONL  = $(ComSpec) /c echo.
 endif
 
 ########################################################
diff --git a/src/Makefile.netware b/src/Makefile.netware
index 9d28c8f60..7f58bcd64 100644
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -31,7 +31,7 @@
 
 # Edit the path below to point to the base of your Novell NDK.
 ifndef NDKBASE
-NDKBASE	= c:/novell
+NDKBASE = c:/novell
 endif
 
 # Edit the path below to point to the base of your Zlib sources.
@@ -95,17 +95,17 @@ LIBCARES_PATH = ../ares
 endif
 
 ifndef INSTDIR
-INSTDIR	= ..$(DS)curl-$(LIBCURL_VERSION_STR)-bin-nw
+INSTDIR = ..$(DS)curl-$(LIBCURL_VERSION_STR)-bin-nw
 endif
 
 # Edit the vars below to change NLM target settings.
 TARGET  = curl
-VERSION	= $(LIBCURL_VERSION)
-COPYR	= Copyright (C) $(LIBCURL_COPYRIGHT_STR)
-DESCR	= curl $(LIBCURL_VERSION_STR) ($(LIBARCH)) - https://curl.haxx.se
-MTSAFE	= YES
-STACK	= 64000
-SCREEN	= $(TARGET) commandline utility
+VERSION = $(LIBCURL_VERSION)
+COPYR   = Copyright (C) $(LIBCURL_COPYRIGHT_STR)
+DESCR   = curl $(LIBCURL_VERSION_STR) ($(LIBARCH)) - https://curl.haxx.se
+MTSAFE  = YES
+STACK   = 64000
+SCREEN  = $(TARGET) commandline utility
 # Comment the line below if you don't want to load protected automatically.
 # LDRING = 3
 
@@ -119,39 +119,39 @@ endif
 
 # must be equal to NDEBUG or DEBUG, CURLDEBUG
 ifndef DB
-DB	= NDEBUG
+DB = NDEBUG
 endif
 # Optimization: -O<n> or debugging: -g
 ifeq ($(DB),NDEBUG)
-	OPT	= -O2
-	OBJDIR	= release
+  OPT = -O2
+  OBJDIR = release
 else
-	OPT	= -g
-	OBJDIR	= debug
+  OPT = -g
+  OBJDIR = debug
 endif
 
 # The following lines defines your compiler.
 ifdef CWFolder
-	METROWERKS = $(CWFolder)
+  METROWERKS = $(CWFolder)
 endif
 ifdef METROWERKS
-	# MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support
-	MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support/Metrowerks Support
-	CC = mwccnlm
+  # MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support
+  MWCW_PATH = $(subst \,/,$(METROWERKS))/Novell Support/Metrowerks Support
+  CC = mwccnlm
 else
-	CC = gcc
+  CC = gcc
 endif
-PERL	= perl
+PERL = perl
 # Here you can find a native Win32 binary of the original awk:
 # http://www.gknw.net/development/prgtools/awk-20100523.zip
-AWK	= awk
-CP	= cp -afv
-MKDIR	= mkdir
-# RM	= rm -f
+AWK = awk
+CP  = cp -afv
+MKDIR = mkdir
+# RM = rm -f
 # If you want to mark the target as MTSAFE you will need a tool for
 # generating the xdc data for the linker; here's a minimal tool:
 # http://www.gknw.net/development/prgtools/mkxdc.zip
-MPKXDC	= mkxdc
+MPKXDC = mkxdc
 
 # LIBARCH_U = $(shell $(AWK) 'BEGIN {print toupper(ARGV[1])}' $(LIBARCH))
 LIBARCH_L = $(shell $(AWK) 'BEGIN {print tolower(ARGV[1])}' $(LIBARCH))
@@ -160,52 +160,52 @@ LIBARCH_L = $(shell $(AWK) 'BEGIN {print tolower(ARGV[1])}' $(LIBARCH))
 -include $(OBJDIR)/version.inc
 
 # Global flags for all compilers
-CFLAGS	+= $(OPT) -D$(DB) -DNETWARE -DHAVE_CONFIG_H -nostdinc
+CFLAGS += $(OPT) -D$(DB) -DNETWARE -DHAVE_CONFIG_H -nostdinc
 
 ifeq ($(CC),mwccnlm)
-LD	= mwldnlm
-LDFLAGS	= -nostdlib $(OBJS) $(PRELUDE) $(LDLIBS) -o $@ -commandfile
-LIBEXT	= lib
-CFLAGS	+= -gccinc -inline off -opt nointrinsics -proc 586
-CFLAGS	+= -relax_pointers
-#CFLAGS	+= -w on
-ifeq ($(LIBARCH),LIBC)
-ifeq ($(POSIXFL),1)
-	PRELUDE = $(NDK_LIBC)/imports/posixpre.o
-else
-	PRELUDE = $(NDK_LIBC)/imports/libcpre.o
-endif
-	CFLAGS += -align 4
+  LD = mwldnlm
+  LDFLAGS = -nostdlib $(OBJS) $(PRELUDE) $(LDLIBS) -o $@ -commandfile
+  LIBEXT  = lib
+  CFLAGS  += -gccinc -inline off -opt nointrinsics -proc 586
+  CFLAGS  += -relax_pointers
+  #CFLAGS += -w on
+  ifeq ($(LIBARCH),LIBC)
+    ifeq ($(POSIXFL),1)
+      PRELUDE = $(NDK_LIBC)/imports/posixpre.o
+    else
+      PRELUDE = $(NDK_LIBC)/imports/libcpre.o
+    endif
+    CFLAGS += -align 4
+  else
+    # PRELUDE = $(NDK_CLIB)/imports/clibpre.o
+    # to avoid the __init_* / __deinit_* woes don't use prelude from NDK
+    PRELUDE = "$(MWCW_PATH)/libraries/runtime/prelude.obj"
+    # CFLAGS += -include "$(MWCW_PATH)/headers/nlm_clib_prefix.h"
+    CFLAGS += -align 1
+  endif
 else
-	# PRELUDE = $(NDK_CLIB)/imports/clibpre.o
-	# to avoid the __init_* / __deinit_* woes don't use prelude from NDK
-	PRELUDE = "$(MWCW_PATH)/libraries/runtime/prelude.obj"
-	# CFLAGS += -include "$(MWCW_PATH)/headers/nlm_clib_prefix.h"
-	CFLAGS += -align 1
-endif
-else
-LD	= nlmconv
-LDFLAGS	= -T
-LIBEXT	= a
-CFLAGS	+= -m32
-CFLAGS  += -fno-builtin -fno-strict-aliasing
-ifeq ($(findstring gcc,$(CC)),gcc)
-CFLAGS  += -fpcc-struct-return
-endif
-CFLAGS	+= -Wall # -pedantic
-ifeq ($(LIBARCH),LIBC)
-ifeq ($(POSIXFL),1)
-	PRELUDE = $(NDK_LIBC)/imports/posixpre.gcc.o
-else
-	PRELUDE = $(NDK_LIBC)/imports/libcpre.gcc.o
-endif
-else
-	# PRELUDE = $(NDK_CLIB)/imports/clibpre.gcc.o
-	# to avoid the __init_* / __deinit_* woes don't use prelude from NDK
-	# http://www.gknw.net/development/mk_nlm/gcc_pre.zip
-	PRELUDE = $(NDK_ROOT)/pre/prelude.o
-	CFLAGS += -include $(NDKBASE)/nlmconv/genlm.h
-endif
+  LD = nlmconv
+  LDFLAGS = -T
+  LIBEXT  = a
+  CFLAGS  += -m32
+  CFLAGS  += -fno-builtin -fno-strict-aliasing
+  ifeq ($(findstring gcc,$(CC)),gcc)
+    CFLAGS  += -fpcc-struct-return
+  endif
+  CFLAGS  += -Wall # -pedantic
+  ifeq ($(LIBARCH),LIBC)
+    ifeq ($(POSIXFL),1)
+      PRELUDE = $(NDK_LIBC)/imports/posixpre.gcc.o
+    else
+      PRELUDE = $(NDK_LIBC)/imports/libcpre.gcc.o
+    endif
+  else
+    # PRELUDE = $(NDK_CLIB)/imports/clibpre.gcc.o
+    # to avoid the __init_* / __deinit_* woes don't use prelude from NDK
+    # http://www.gknw.net/development/mk_nlm/gcc_pre.zip
+    PRELUDE = $(NDK_ROOT)/pre/prelude.o
+    CFLAGS += -include $(NDKBASE)/nlmconv/genlm.h
+  endif
 endif
 
 NDK_ROOT = $(NDKBASE)/ndk
@@ -265,124 +265,124 @@ ENABLE_IPV6 = 1
 endif
 
 ifdef LINK_STATIC
-	LDLIBS	= $(CURL_LIB)/libcurl.$(LIBEXT)
+  LDLIBS = $(CURL_LIB)/libcurl.$(LIBEXT)
 ifdef WITH_ARES
-	LDLIBS += $(LIBCARES_PATH)/libcares.$(LIBEXT)
+  LDLIBS += $(LIBCARES_PATH)/libcares.$(LIBEXT)
 endif
 else
-	MODULES	= libcurl.nlm
-	IMPORTS	= @$(CURL_LIB)/libcurl.imp
+  MODULES  = libcurl.nlm
+  IMPORTS = @$(CURL_LIB)/libcurl.imp
 endif
 ifdef WITH_SSH2
-	# INCLUDES += -I$(LIBSSH2_PATH)/include
-ifdef LINK_STATIC
-	LDLIBS += $(LIBSSH2_PATH)/nw/libssh2.$(LIBEXT)
-else
-	MODULES += libssh2.nlm
-	IMPORTS += @$(LIBSSH2_PATH)/nw/libssh2.imp
-endif
+  # INCLUDES += -I$(LIBSSH2_PATH)/include
+  ifdef LINK_STATIC
+    LDLIBS += $(LIBSSH2_PATH)/nw/libssh2.$(LIBEXT)
+  else
+    MODULES += libssh2.nlm
+    IMPORTS += @$(LIBSSH2_PATH)/nw/libssh2.imp
+  endif
 endif
 ifdef WITH_RTMP
-	# INCLUDES += -I$(LIBRTMP_PATH)
-ifdef LINK_STATIC
-	LDLIBS += $(LIBRTMP_PATH)/librtmp/librtmp.$(LIBEXT)
-endif
+  # INCLUDES += -I$(LIBRTMP_PATH)
+  ifdef LINK_STATIC
+    LDLIBS += $(LIBRTMP_PATH)/librtmp/librtmp.$(LIBEXT)
+  endif
 endif
 ifdef WITH_SSL
-	# INCLUDES += -I$(OPENSSL_PATH)/outinc_nw_$(LIBARCH_L)
-	LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/ssl.$(LIBEXT)
-	LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/crypto.$(LIBEXT)
-	IMPORTS += GetProcessSwitchCount RunningProcess
+  # INCLUDES += -I$(OPENSSL_PATH)/outinc_nw_$(LIBARCH_L)
+  LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/ssl.$(LIBEXT)
+  LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/crypto.$(LIBEXT)
+  IMPORTS += GetProcessSwitchCount RunningProcess
 else
 ifdef WITH_AXTLS
-	# INCLUDES += -I$(AXTLS_PATH)/inc
-ifdef LINK_STATIC
-	LDLIBS += $(AXTLS_PATH)/lib/libaxtls.$(LIBEXT)
-else
-	MODULES += libaxtls.nlm
-	IMPORTS += $(AXTLS_PATH)/lib/libaxtls.imp
-endif
+  # INCLUDES += -I$(AXTLS_PATH)/inc
+  ifdef LINK_STATIC
+    LDLIBS += $(AXTLS_PATH)/lib/libaxtls.$(LIBEXT)
+  else
+    MODULES += libaxtls.nlm
+    IMPORTS += $(AXTLS_PATH)/lib/libaxtls.imp
+  endif
 endif
 endif
 ifdef WITH_ZLIB
-	INCLUDES += -I$(ZLIB_PATH)
-ifdef LINK_STATIC
-	LDLIBS += $(ZLIB_PATH)/nw/$(LIBARCH)/libz.$(LIBEXT)
-else
-	MODULES += libz.nlm
-	IMPORTS += @$(ZLIB_PATH)/nw/$(LIBARCH)/libz.imp
-endif
+  INCLUDES += -I$(ZLIB_PATH)
+  ifdef LINK_STATIC
+    LDLIBS += $(ZLIB_PATH)/nw/$(LIBARCH)/libz.$(LIBEXT)
+  else
+    MODULES += libz.nlm
+    IMPORTS += @$(ZLIB_PATH)/nw/$(LIBARCH)/libz.imp
+  endif
 endif
 ifdef WITH_IDN
-	# INCLUDES += -I$(LIBIDN_PATH)/include
-	LDLIBS += $(LIBIDN_PATH)/lib/libidn.$(LIBEXT)
+  # INCLUDES += -I$(LIBIDN_PATH)/include
+  LDLIBS += $(LIBIDN_PATH)/lib/libidn.$(LIBEXT)
 endif
 ifdef WITH_NGHTTP2
-	INCLUDES += -I$(NGHTTP2_PATH)/include
-	LDLIBS += $(NGHTTP2_PATH)/lib/libnghttp2.$(LIBEXT)
+  INCLUDES += -I$(NGHTTP2_PATH)/include
+  LDLIBS += $(NGHTTP2_PATH)/lib/libnghttp2.$(LIBEXT)
 endif
 ifdef WITH_METALINK
-	CFLAGS += -DUSE_METALINK
-	INCLUDES += -I$(OPENSSL_PATH)/outinc_nw_$(LIBARCH_L)
-	INCLUDES += -I$(LIBMETALINK_PATH)/include
-	LDLIBS += $(LIBMETALINK_PATH)/lib/libmetalink.$(LIBEXT)
-ifdef WITH_LIBEXPAT
-	ifeq ($(LIBARCH),LIBC)
-		IMPORTS += @$(LIBEXPAT_PATH)/imports/expatlbc.imp
-		MODULES += expatlbc
-	else
-		IMPORTS += @$(LIBEXPAT_PATH)/imports/expatlib.imp
-		MODULES += expatlib
-	endif
+  CFLAGS += -DUSE_METALINK
+  INCLUDES += -I$(OPENSSL_PATH)/outinc_nw_$(LIBARCH_L)
+  INCLUDES += -I$(LIBMETALINK_PATH)/include
+  LDLIBS += $(LIBMETALINK_PATH)/lib/libmetalink.$(LIBEXT)
+  ifdef WITH_LIBEXPAT
+    ifeq ($(LIBARCH),LIBC)
+      IMPORTS += @$(LIBEXPAT_PATH)/imports/expatlbc.imp
+      MODULES += expatlbc
+    else
+      IMPORTS += @$(LIBEXPAT_PATH)/imports/expatlib.imp
+      MODULES += expatlib
+  endif
 else
 ifdef WITH_LIBXML2
-	IMPORTS += @$(LIBXML2_PATH)/lib/libxml2.imp
-	MODULES += libxml2
+  IMPORTS += @$(LIBXML2_PATH)/lib/libxml2.imp
+  MODULES += libxml2
 endif
 endif
 endif
 
 ifeq ($(LIBARCH),LIBC)
-	INCLUDES += -I$(NDK_LIBC)/include
-	# INCLUDES += -I$(NDK_LIBC)/include/nks
-	# INCLUDES += -I$(NDK_LIBC)/include/winsock
-	CFLAGS += -D_POSIX_SOURCE
+  INCLUDES += -I$(NDK_LIBC)/include
+  # INCLUDES += -I$(NDK_LIBC)/include/nks
+  # INCLUDES += -I$(NDK_LIBC)/include/winsock
+  CFLAGS += -D_POSIX_SOURCE
 else
-	INCLUDES += -I$(NDK_CLIB)/include/nlm
-	# INCLUDES += -I$(NDK_CLIB)/include
+  INCLUDES += -I$(NDK_CLIB)/include/nlm
+  # INCLUDES += -I$(NDK_CLIB)/include
 endif
 ifndef DISABLE_LDAP
-	# INCLUDES += -I$(NDK_LDAP)/$(LIBARCH_L)/inc
+  # INCLUDES += -I$(NDK_LDAP)/$(LIBARCH_L)/inc
 endif
-CFLAGS	+= $(INCLUDES)
+CFLAGS += $(INCLUDES)
 
 ifeq ($(MTSAFE),YES)
-	XDCOPT = -n
+  XDCOPT = -n
 endif
 ifeq ($(MTSAFE),NO)
-	XDCOPT = -u
+  XDCOPT = -u
 endif
 ifdef XDCOPT
-	XDCDATA = $(OBJDIR)/$(TARGET).xdc
+  XDCDATA = $(OBJDIR)/$(TARGET).xdc
 endif
 
 ifeq ($(findstring /sh,$(SHELL)),/sh)
-DL	= '
-DS	= /
-PCT	= %
+DL  = '
+DS  = /
+PCT = %
 #-include $(NDKBASE)/nlmconv/ncpfs.inc
 else
-DS	= \\
-PCT	= %%
+DS  = \\
+PCT = %%
 endif
 
 # Makefile.inc provides the CSOURCES and HHEADERS defines
 include Makefile.inc
 
-OBJX	:= $(patsubst %.c,$(OBJDIR)/%.o,$(notdir $(strip $(CURLX_CFILES))))
-OBJS	:= $(patsubst %.c,$(OBJDIR)/%.o,$(strip $(CURL_CFILES)))
+OBJX := $(patsubst %.c,$(OBJDIR)/%.o,$(notdir $(strip $(CURLX_CFILES))))
+OBJS := $(patsubst %.c,$(OBJDIR)/%.o,$(strip $(CURL_CFILES)))
 ifndef LINK_STATIC
-OBJS	+= $(OBJX)
+OBJS += $(OBJX)
 endif
 
 vpath %.c $(CURL_LIB)
@@ -520,5 +520,3 @@ tool_hugehelp.c:
 
 $(LIBCARES_PATH)/libcares.$(LIBEXT):
 	$(MAKE) -C $(LIBCARES_PATH) -f Makefile.netware lib
-
-
diff --git a/src/makefile.amiga b/src/makefile.amiga
index 9f3748b1a..3bc0080f8 100644
--- a/src/makefile.amiga
+++ b/src/makefile.amiga
@@ -4,21 +4,21 @@
 
 # change the follow to where you have the AmiTCP SDK v4.3 includes:
 
-ATCPSDKI=	/GG/netinclude
+ATCPSDKI= /GG/netinclude
 
 
-CC	=	m68k-amigaos-gcc
-CFLAGS	=	-I$(ATCPSDKI) -m68020-60 -O2 -msoft-float -noixemul -g -I. -I../include -W -Wall
-LIBS	=	../lib/libcurl.a -lssl -lcrypto -lz
-MANPAGE =	../docs/curl.1
-README	=	../docs/MANUAL
-MKHELP	=	../src/mkhelp.pl
+CC = m68k-amigaos-gcc
+CFLAGS  = -I$(ATCPSDKI) -m68020-60 -O2 -msoft-float -noixemul -g -I. -I../include -W -Wall
+LIBS    = ../lib/libcurl.a -lssl -lcrypto -lz
+MANPAGE = ../docs/curl.1
+README  = ../docs/MANUAL
+MKHELP  = ../src/mkhelp.pl
 
 include Makefile.inc
 
 OBJS = $(CURL_CFILES:.c=.o) $(CURLX_CFILES:.c=.o)
 
-all:	tool_hugehelp.c $(OBJS)
+all: tool_hugehelp.c $(OBJS)
 	$(CC) $(CFLAGS) -o curl $(OBJS) $(LIBS) -Wl,-Map,curl.map,--cref
 
 tool_hugehelp.c: $(README) $(MANPAGE)  mkhelp.pl
@@ -27,4 +27,3 @@ tool_hugehelp.c: $(README) $(MANPAGE)  mkhelp.pl
 
 install:
 	$(INSTALL) -c curl /c/curl
-
diff --git a/src/makefile.dj b/src/makefile.dj
index fbd2d3738..a9f5d3a5e 100644
--- a/src/makefile.dj
+++ b/src/makefile.dj
@@ -91,4 +91,3 @@ realclean vclean: clean
 	- $(DELETE) $(PROGRAM)
 
 -include depend.dj
-
diff --git a/src/slist_wc.h b/src/slist_wc.h
index d8943122c..9bd6993db 100644
--- a/src/slist_wc.h
+++ b/src/slist_wc.h
@@ -53,4 +53,3 @@ void slist_wc_free_all(struct slist_wc *);
 #endif /* CURL_DISABLE_LIBCURL_OPTION */
 
 #endif /* HEADER_CURL_SLIST_WC_H */
-
diff --git a/src/tool_binmode.c b/src/tool_binmode.c
index 5ca64cd58..f70015641 100644
--- a/src/tool_binmode.c
+++ b/src/tool_binmode.c
@@ -49,4 +49,3 @@ void set_binmode(FILE *stream)
 }
 
 #endif /* HAVE_SETMODE */
-
diff --git a/src/tool_binmode.h b/src/tool_binmode.h
index 8b445ae66..07b7ffedf 100644
--- a/src/tool_binmode.h
+++ b/src/tool_binmode.h
@@ -34,4 +34,3 @@ void set_binmode(FILE *stream);
 #endif /* HAVE_SETMODE */
 
 #endif /* HEADER_CURL_TOOL_BINMODE_H */
-
diff --git a/src/tool_bname.c b/src/tool_bname.c
index 5cc5c15df..761192fe9 100644
--- a/src/tool_bname.c
+++ b/src/tool_bname.c
@@ -47,4 +47,3 @@ char *tool_basename(char *path)
 }
 
 #endif /* HAVE_BASENAME */
-
diff --git a/src/tool_bname.h b/src/tool_bname.h
index 61b97b492..66e7c1733 100644
--- a/src/tool_bname.h
+++ b/src/tool_bname.h
@@ -32,4 +32,3 @@ char *tool_basename(char *path);
 #endif /* HAVE_BASENAME */
 
 #endif /* HEADER_CURL_TOOL_BNAME_H */
-
diff --git a/src/tool_cb_dbg.c b/src/tool_cb_dbg.c
index c2dd51b7c..a3e033977 100644
--- a/src/tool_cb_dbg.c
+++ b/src/tool_cb_dbg.c
@@ -279,4 +279,3 @@ static void dump(const char *timebuf, const char *text,
   }
   fflush(stream);
 }
-
diff --git a/src/tool_cb_dbg.h b/src/tool_cb_dbg.h
index c1cbc8073..433e74616 100644
--- a/src/tool_cb_dbg.h
+++ b/src/tool_cb_dbg.h
@@ -32,4 +32,3 @@ int tool_debug_cb(CURL *handle, curl_infotype type,
                   void *userdata);
 
 #endif /* HEADER_CURL_TOOL_CB_DBG_H */
-
diff --git a/src/tool_cb_hdr.h b/src/tool_cb_hdr.h
index e1b9a920e..cf544dfcb 100644
--- a/src/tool_cb_hdr.h
+++ b/src/tool_cb_hdr.h
@@ -53,4 +53,3 @@ struct HdrCbData {
 size_t tool_header_cb(char *ptr, size_t size, size_t nmemb, void *userdata);
 
 #endif /* HEADER_CURL_TOOL_CB_HDR_H */
-
diff --git a/src/tool_cb_prg.h b/src/tool_cb_prg.h
index f8d6deaba..cc8876849 100644
--- a/src/tool_cb_prg.h
+++ b/src/tool_cb_prg.h
@@ -50,4 +50,3 @@ int tool_progress_cb(void *clientp,
                      curl_off_t ultotal, curl_off_t ulnow);
 
 #endif /* HEADER_CURL_TOOL_CB_PRG_H */
-
diff --git a/src/tool_cb_rea.c b/src/tool_cb_rea.c
index 88137ae74..8a33c847b 100644
--- a/src/tool_cb_rea.c
+++ b/src/tool_cb_rea.c
@@ -52,4 +52,3 @@ size_t tool_read_cb(void *buffer, size_t sz, size_t nmemb, void *userdata)
   in->config->readbusy = FALSE;
   return (size_t)rc;
 }
-
diff --git a/src/tool_cb_rea.h b/src/tool_cb_rea.h
index 5fbc793f6..475f0b1c3 100644
--- a/src/tool_cb_rea.h
+++ b/src/tool_cb_rea.h
@@ -30,4 +30,3 @@
 size_t tool_read_cb(void *buffer, size_t sz, size_t nmemb, void *userdata);
 
 #endif /* HEADER_CURL_TOOL_CB_REA_H */
-
diff --git a/src/tool_cb_see.c b/src/tool_cb_see.c
index 061b2bb3d..891dc458a 100644
--- a/src/tool_cb_see.c
+++ b/src/tool_cb_see.c
@@ -130,4 +130,3 @@ int tool_ftruncate64(int fd, curl_off_t where)
 }
 
 #endif /* WIN32  && ! __MINGW64__ */
-
diff --git a/src/tool_cb_see.h b/src/tool_cb_see.h
index b07741da6..ff8de0e9a 100644
--- a/src/tool_cb_see.h
+++ b/src/tool_cb_see.h
@@ -43,4 +43,3 @@ int tool_ftruncate64(int fd, curl_off_t where);
 int tool_seek_cb(void *userdata, curl_off_t offset, int whence);
 
 #endif /* HEADER_CURL_TOOL_CB_SEE_H */
-
diff --git a/src/tool_cb_wrt.h b/src/tool_cb_wrt.h
index 2b6e98ae4..51e002bea 100644
--- a/src/tool_cb_wrt.h
+++ b/src/tool_cb_wrt.h
@@ -33,4 +33,3 @@ size_t tool_write_cb(char *buffer, size_t sz, size_t nmemb, void *userdata);
 bool tool_create_output_file(struct OutStruct *outs, bool append);
 
 #endif /* HEADER_CURL_TOOL_CB_WRT_H */
-
diff --git a/src/tool_convert.c b/src/tool_convert.c
index d0f5dcb00..ec9d7ac7c 100644
--- a/src/tool_convert.c
+++ b/src/tool_convert.c
@@ -147,4 +147,3 @@ char convert_char(curl_infotype infotype, char this_char)
 }
 
 #endif /* CURL_DOES_CONVERSIONS */
-
diff --git a/src/tool_convert.h b/src/tool_convert.h
index d1b1d2327..27b4ce90f 100644
--- a/src/tool_convert.h
+++ b/src/tool_convert.h
@@ -42,4 +42,3 @@ char convert_char(curl_infotype infotype, char this_char);
 #endif
 
 #endif /* HEADER_CURL_TOOL_CONVERT_H */
-
diff --git a/src/tool_dirhie.c b/src/tool_dirhie.c
index 36c06941c..24bbc4906 100644
--- a/src/tool_dirhie.c
+++ b/src/tool_dirhie.c
@@ -153,4 +153,3 @@ CURLcode create_dir_hierarchy(const char *outfile, FILE *errors)
 
   return result;
 }
-
diff --git a/src/tool_dirhie.h b/src/tool_dirhie.h
index cc67687de..011a5774f 100644
--- a/src/tool_dirhie.h
+++ b/src/tool_dirhie.h
@@ -26,4 +26,3 @@
 CURLcode create_dir_hierarchy(const char *outfile, FILE *errors);
 
 #endif /* HEADER_CURL_TOOL_DIRHIE_H */
-
diff --git a/src/tool_doswin.h b/src/tool_doswin.h
index 289281f4f..6398390f1 100644
--- a/src/tool_doswin.h
+++ b/src/tool_doswin.h
@@ -66,4 +66,3 @@ CURLcode FindWin32CACert(struct OperationConfig *config,
 #endif /* MSDOS || WIN32 */
 
 #endif /* HEADER_CURL_TOOL_DOSWIN_H */
-
diff --git a/src/tool_filetime.h b/src/tool_filetime.h
index 966a70b46..f23afcf30 100644
--- a/src/tool_filetime.h
+++ b/src/tool_filetime.h
@@ -35,4 +35,3 @@ void setfiletime(curl_off_t filetime, const char *filename,
           (defined(WIN32) && (SIZEOF_CURL_OFF_T >= 8)) */
 
 #endif /* HEADER_CURL_TOOL_FILETIME_H */
-
diff --git a/src/tool_formparse.h b/src/tool_formparse.h
index a52b98d39..cdf02d028 100644
--- a/src/tool_formparse.h
+++ b/src/tool_formparse.h
@@ -30,4 +30,3 @@ int formparse(struct OperationConfig *config,
               bool literal_value);
 
 #endif /* HEADER_CURL_TOOL_FORMPARSE_H */
-
diff --git a/src/tool_getparam.h b/src/tool_getparam.h
index 2148e4091..daf83b884 100644
--- a/src/tool_getparam.h
+++ b/src/tool_getparam.h
@@ -62,4 +62,3 @@ ParameterError parse_args(struct GlobalConfig *config, int argc,
                           argv_item_t argv[]);
 
 #endif /* HEADER_CURL_TOOL_GETPARAM_H */
-
diff --git a/src/tool_help.h b/src/tool_help.h
index 43432d714..0289f3015 100644
--- a/src/tool_help.h
+++ b/src/tool_help.h
@@ -28,4 +28,3 @@ void tool_list_engines(CURL *curl);
 void tool_version_info(void);
 
 #endif /* HEADER_CURL_TOOL_HELP_H */
-
diff --git a/src/tool_helpers.h b/src/tool_helpers.h
index 9ede16e64..33483ebc3 100644
--- a/src/tool_helpers.h
+++ b/src/tool_helpers.h
@@ -32,4 +32,3 @@ void customrequest_helper(struct OperationConfig *config, HttpReq req,
                           char *method);
 
 #endif /* HEADER_CURL_TOOL_HELPERS_H */
-
diff --git a/src/tool_libinfo.c b/src/tool_libinfo.c
index 583570988..19ec65ac6 100644
--- a/src/tool_libinfo.c
+++ b/src/tool_libinfo.c
@@ -99,4 +99,3 @@ CURLcode get_libcurl_info(void)
 
   return CURLE_OK;
 }
-
diff --git a/src/tool_libinfo.h b/src/tool_libinfo.h
index 298df8013..b3a9b9cdd 100644
--- a/src/tool_libinfo.h
+++ b/src/tool_libinfo.h
@@ -31,4 +31,3 @@ extern long built_in_protos;
 CURLcode get_libcurl_info(void);
 
 #endif /* HEADER_CURL_TOOL_LIBINFO_H */
-
diff --git a/src/tool_main.h b/src/tool_main.h
index c97c3607f..868818816 100644
--- a/src/tool_main.h
+++ b/src/tool_main.h
@@ -41,4 +41,3 @@
 #endif
 
 #endif /* HEADER_CURL_TOOL_MAIN_H */
-
diff --git a/src/tool_msgs.c b/src/tool_msgs.c
index 9cce8063e..832ed8147 100644
--- a/src/tool_msgs.c
+++ b/src/tool_msgs.c
@@ -122,4 +122,3 @@ void helpf(FILE *errors, const char *fmt, ...)
 #endif
           "for more information\n");
 }
-
diff --git a/src/tool_msgs.h b/src/tool_msgs.h
index e84c1b247..d1cc7f8d5 100644
--- a/src/tool_msgs.h
+++ b/src/tool_msgs.h
@@ -29,4 +29,3 @@ void notef(struct GlobalConfig *config, const char *fmt, ...);
 void helpf(FILE *errors, const char *fmt, ...);
 
 #endif /* HEADER_CURL_TOOL_MSGS_H */
-
diff --git a/src/tool_operate.h b/src/tool_operate.h
index c54fe3fca..b84388bc5 100644
--- a/src/tool_operate.h
+++ b/src/tool_operate.h
@@ -26,4 +26,3 @@
 CURLcode operate(struct GlobalConfig *config, int argc, argv_item_t argv[]);
 
 #endif /* HEADER_CURL_TOOL_OPERATE_H */
-
diff --git a/src/tool_operhlp.h b/src/tool_operhlp.h
index 446c56067..90c854929 100644
--- a/src/tool_operhlp.h
+++ b/src/tool_operhlp.h
@@ -36,4 +36,3 @@ char *add_file_name_to_url(CURL *curl, char *url, const char *filename);
 CURLcode get_url_file_name(char **filename, const char *url);
 
 #endif /* HEADER_CURL_TOOL_OPERHLP_H */
-
diff --git a/src/tool_panykey.c b/src/tool_panykey.c
index 14e1e05c5..b0e556307 100644
--- a/src/tool_panykey.c
+++ b/src/tool_panykey.c
@@ -45,4 +45,3 @@ void tool_pressanykey(void)
 }
 
 #endif /* __SYMBIAN32__ || NETWARE */
-
diff --git a/src/tool_panykey.h b/src/tool_panykey.h
index 9d64418e2..6371a88a7 100644
--- a/src/tool_panykey.h
+++ b/src/tool_panykey.h
@@ -34,4 +34,3 @@ void tool_pressanykey(void);
 #endif
 
 #endif /* HEADER_CURL_TOOL_PANYKEY_H */
-
diff --git a/src/tool_parsecfg.c b/src/tool_parsecfg.c
index 34b5d8b25..e57d76026 100644
--- a/src/tool_parsecfg.c
+++ b/src/tool_parsecfg.c
@@ -356,4 +356,3 @@ static char *my_get_line(FILE *fp)
 
   return line;
 }
-
diff --git a/src/tool_parsecfg.h b/src/tool_parsecfg.h
index b676ec3c6..340626190 100644
--- a/src/tool_parsecfg.h
+++ b/src/tool_parsecfg.h
@@ -26,4 +26,3 @@
 int parseconfig(const char *filename, struct GlobalConfig *config);
 
 #endif /* HEADER_CURL_TOOL_PARSECFG_H */
-
diff --git a/src/tool_sdecls.h b/src/tool_sdecls.h
index 48dd4aed9..ebec9eebb 100644
--- a/src/tool_sdecls.h
+++ b/src/tool_sdecls.h
@@ -148,4 +148,3 @@ typedef enum {
 #include "tool_cfgable.h"
 
 #endif /* HEADER_CURL_TOOL_SDECLS_H */
-
diff --git a/src/tool_setup.h b/src/tool_setup.h
index 90b01d7e9..854973e41 100644
--- a/src/tool_setup.h
+++ b/src/tool_setup.h
@@ -71,4 +71,3 @@
 #endif
 
 #endif /* HEADER_CURL_TOOL_SETUP_H */
-
diff --git a/src/tool_sleep.c b/src/tool_sleep.c
index a63d85ffb..edb5aedc0 100644
--- a/src/tool_sleep.c
+++ b/src/tool_sleep.c
@@ -55,4 +55,3 @@ void tool_go_sleep(long ms)
   select(0, NULL,  NULL, NULL, &timeout);
 #endif
 }
-
diff --git a/src/tool_sleep.h b/src/tool_sleep.h
index 6c51a9307..3aaab52d7 100644
--- a/src/tool_sleep.h
+++ b/src/tool_sleep.h
@@ -26,4 +26,3 @@
 void tool_go_sleep(long ms);
 
 #endif /* HEADER_CURL_TOOL_SLEEP_H */
-
diff --git a/src/tool_urlglob.h b/src/tool_urlglob.h
index 82d9d46d6..55ac34611 100644
--- a/src/tool_urlglob.h
+++ b/src/tool_urlglob.h
@@ -74,4 +74,3 @@ CURLcode glob_match_url(char **, char *, URLGlob *);
 void glob_cleanup(URLGlob* glob);
 
 #endif /* HEADER_CURL_TOOL_URLGLOB_H */
-
diff --git a/src/tool_util.h b/src/tool_util.h
index fda1e61bf..5339c1167 100644
--- a/src/tool_util.h
+++ b/src/tool_util.h
@@ -34,4 +34,3 @@ struct timeval tvnow(void);
 long tvdiff(struct timeval t1, struct timeval t2);
 
 #endif /* HEADER_CURL_TOOL_UTIL_H */
-
diff --git a/src/tool_vms.c b/src/tool_vms.c
index cc30fe0f4..54871a65e 100644
--- a/src/tool_vms.c
+++ b/src/tool_vms.c
@@ -216,4 +216,3 @@ int dmy_lib$initialize = (int) LIB$INITIALIZE;
 #endif /* __DECC && !__VAX && __CRTL_VER && __CRTL_VER >= 70301000 */
 
 #endif /* __VMS */
-
diff --git a/src/tool_vms.h b/src/tool_vms.h
index 6656a5996..96c86f1ce 100644
--- a/src/tool_vms.h
+++ b/src/tool_vms.h
@@ -44,4 +44,3 @@ void vms_special_exit(int code, int vms_show);
 #endif /* __VMS */
 
 #endif /* HEADER_CURL_TOOL_VMS_H */
-
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
 </stdout>
 </verify>
 </testcase>
-
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
 </protocol>
 </verify>
 </testcase>
-
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
 </verify>
 
 </testcase>
-
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
 </verify>
 
 </testcase>
-
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]
 </verify>
 
 </testcase>
-
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
 </verify>
 
 </testcase>
-
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
 </verify>
 
 </testcase>
-
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
 </verify>
 
 </testcase>
-
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 <<TOP
diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am
index dc97e327e..56c84a765 100644
--- a/tests/libtest/Makefile.am
+++ b/tests/libtest/Makefile.am
@@ -44,8 +44,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/include        \
               -I$(top_srcdir)/lib
 endif
 
-EXTRA_DIST = test75.pl test307.pl test610.pl test613.pl test1013.pl	\
-test1022.pl Makefile.inc notexists.pl CMakeLists.txt mk-lib1521.pl
+EXTRA_DIST = test75.pl test307.pl test610.pl test613.pl test1013.pl \
+  test1022.pl Makefile.inc notexists.pl CMakeLists.txt mk-lib1521.pl
 
 CFLAG_CURL_SYMBOL_HIDING = @CFLAG_CURL_SYMBOL_HIDING@
 
diff --git a/tests/libtest/lib1507.c b/tests/libtest/lib1507.c
index 5e3a5926a..dc023a079 100644
--- a/tests/libtest/lib1507.c
+++ b/tests/libtest/lib1507.c
@@ -147,5 +147,3 @@ test_cleanup:
 
   return res;
 }
-
-
diff --git a/tests/libtest/lib1512.c b/tests/libtest/lib1512.c
index 5e794b293..1c2578958 100644
--- a/tests/libtest/lib1512.c
+++ b/tests/libtest/lib1512.c
@@ -88,4 +88,3 @@ test_cleanup:
 
   return res;
 }
-
diff --git a/tests/libtest/lib1520.c b/tests/libtest/lib1520.c
index 4d5b0c88c..c6ac64bb4 100644
--- a/tests/libtest/lib1520.c
+++ b/tests/libtest/lib1520.c
@@ -111,5 +111,3 @@ test_cleanup:
 
   return (int)res;
 }
-
-
diff --git a/tests/libtest/lib1526.c b/tests/libtest/lib1526.c
index 704ae497d..663465799 100644
--- a/tests/libtest/lib1526.c
+++ b/tests/libtest/lib1526.c
@@ -101,4 +101,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib1531.c b/tests/libtest/lib1531.c
index 953f062d8..4a4dc133a 100644
--- a/tests/libtest/lib1531.c
+++ b/tests/libtest/lib1531.c
@@ -155,4 +155,3 @@ test_cleanup:
 
   return res;
 }
-
diff --git a/tests/libtest/lib1533.c b/tests/libtest/lib1533.c
index ada94b940..962a222ec 100644
--- a/tests/libtest/lib1533.c
+++ b/tests/libtest/lib1533.c
@@ -197,4 +197,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib500.c b/tests/libtest/lib500.c
index 2a6c58bb5..8d9b92129 100644
--- a/tests/libtest/lib500.c
+++ b/tests/libtest/lib500.c
@@ -154,4 +154,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib501.c b/tests/libtest/lib501.c
index af65bd4d7..4549cb648 100644
--- a/tests/libtest/lib501.c
+++ b/tests/libtest/lib501.c
@@ -56,4 +56,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib502.c b/tests/libtest/lib502.c
index ce4bc47d1..df8905c84 100644
--- a/tests/libtest/lib502.c
+++ b/tests/libtest/lib502.c
@@ -89,4 +89,3 @@ test_cleanup:
 
   return res;
 }
-
diff --git a/tests/libtest/lib503.c b/tests/libtest/lib503.c
index 15b45f95b..00791edf5 100644
--- a/tests/libtest/lib503.c
+++ b/tests/libtest/lib503.c
@@ -99,4 +99,3 @@ test_cleanup:
 
   return res;
 }
-
diff --git a/tests/libtest/lib504.c b/tests/libtest/lib504.c
index 771b2038a..8d1fe506e 100644
--- a/tests/libtest/lib504.c
+++ b/tests/libtest/lib504.c
@@ -111,4 +111,3 @@ test_cleanup:
 
   return res;
 }
-
diff --git a/tests/libtest/lib506.c b/tests/libtest/lib506.c
index 5ed4f37ea..9f656e032 100644
--- a/tests/libtest/lib506.c
+++ b/tests/libtest/lib506.c
@@ -377,4 +377,3 @@ test_cleanup:
 
   return res;
 }
-
diff --git a/tests/libtest/lib509.c b/tests/libtest/lib509.c
index 4f3e072ae..59ced355f 100644
--- a/tests/libtest/lib509.c
+++ b/tests/libtest/lib509.c
@@ -144,4 +144,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib512.c b/tests/libtest/lib512.c
index 0c83ddd53..8a6f0e149 100644
--- a/tests/libtest/lib512.c
+++ b/tests/libtest/lib512.c
@@ -72,4 +72,3 @@ int test(char *URL)
 
   return rc;
 }
-
diff --git a/tests/libtest/lib519.c b/tests/libtest/lib519.c
index 5c55aebe6..73da7d5ca 100644
--- a/tests/libtest/lib519.c
+++ b/tests/libtest/lib519.c
@@ -60,4 +60,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib521.c b/tests/libtest/lib521.c
index b7efca0be..8d9aa2e2c 100644
--- a/tests/libtest/lib521.c
+++ b/tests/libtest/lib521.c
@@ -54,4 +54,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib523.c b/tests/libtest/lib523.c
index 44aa2e2e9..450438939 100644
--- a/tests/libtest/lib523.c
+++ b/tests/libtest/lib523.c
@@ -55,4 +55,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib524.c b/tests/libtest/lib524.c
index 08fd34dfc..fe0a8ed21 100644
--- a/tests/libtest/lib524.c
+++ b/tests/libtest/lib524.c
@@ -53,4 +53,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib547.c b/tests/libtest/lib547.c
index 3db4890de..3cfc81d29 100644
--- a/tests/libtest/lib547.c
+++ b/tests/libtest/lib547.c
@@ -128,4 +128,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib549.c b/tests/libtest/lib549.c
index 1d832b536..bb41cd619 100644
--- a/tests/libtest/lib549.c
+++ b/tests/libtest/lib549.c
@@ -63,4 +63,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib555.c b/tests/libtest/lib555.c
index c887b56f0..42c89d8c9 100644
--- a/tests/libtest/lib555.c
+++ b/tests/libtest/lib555.c
@@ -161,4 +161,3 @@ test_cleanup:
 
   return res;
 }
-
diff --git a/tests/libtest/lib556.c b/tests/libtest/lib556.c
index 884f413aa..69b2c09dd 100644
--- a/tests/libtest/lib556.c
+++ b/tests/libtest/lib556.c
@@ -106,4 +106,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib558.c b/tests/libtest/lib558.c
index 09a50d6b6..d9969738a 100644
--- a/tests/libtest/lib558.c
+++ b/tests/libtest/lib558.c
@@ -50,4 +50,3 @@ int test(char *URL)
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib559.c b/tests/libtest/lib559.c
index 8c72dbd0c..be112b8f3 100644
--- a/tests/libtest/lib559.c
+++ b/tests/libtest/lib559.c
@@ -53,4 +53,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib566.c b/tests/libtest/lib566.c
index ecf8c5530..257738a4f 100644
--- a/tests/libtest/lib566.c
+++ b/tests/libtest/lib566.c
@@ -65,4 +65,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib567.c b/tests/libtest/lib567.c
index 64fb29afb..7a730d26a 100644
--- a/tests/libtest/lib567.c
+++ b/tests/libtest/lib567.c
@@ -67,4 +67,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib568.c b/tests/libtest/lib568.c
index 3bb53f61e..c1388f16f 100644
--- a/tests/libtest/lib568.c
+++ b/tests/libtest/lib568.c
@@ -175,4 +175,3 @@ test_cleanup:
 
   return res;
 }
-
diff --git a/tests/libtest/lib569.c b/tests/libtest/lib569.c
index c18c882b9..9c25db45d 100644
--- a/tests/libtest/lib569.c
+++ b/tests/libtest/lib569.c
@@ -125,4 +125,3 @@ test_cleanup:
 
   return res;
 }
-
diff --git a/tests/libtest/lib570.c b/tests/libtest/lib570.c
index 1756a8615..d88f100f3 100644
--- a/tests/libtest/lib570.c
+++ b/tests/libtest/lib570.c
@@ -113,4 +113,3 @@ test_cleanup:
 
   return res;
 }
-
diff --git a/tests/libtest/lib571.c b/tests/libtest/lib571.c
index 70524f2f2..c048747d9 100644
--- a/tests/libtest/lib571.c
+++ b/tests/libtest/lib571.c
@@ -212,4 +212,3 @@ test_cleanup:
 
   return res;
 }
-
diff --git a/tests/libtest/lib572.c b/tests/libtest/lib572.c
index a78c9358d..82d5049d0 100644
--- a/tests/libtest/lib572.c
+++ b/tests/libtest/lib572.c
@@ -181,4 +181,3 @@ test_cleanup:
 
   return res;
 }
-
diff --git a/tests/libtest/lib573.c b/tests/libtest/lib573.c
index eb817b1ed..e80824d16 100644
--- a/tests/libtest/lib573.c
+++ b/tests/libtest/lib573.c
@@ -111,4 +111,3 @@ test_cleanup:
 
   return res;
 }
-
diff --git a/tests/libtest/lib586.c b/tests/libtest/lib586.c
index a831b83d4..247422483 100644
--- a/tests/libtest/lib586.c
+++ b/tests/libtest/lib586.c
@@ -244,4 +244,3 @@ test_cleanup:
 
   return res;
 }
-
diff --git a/tests/libtest/lib590.c b/tests/libtest/lib590.c
index cc3afdf06..db433fb9e 100644
--- a/tests/libtest/lib590.c
+++ b/tests/libtest/lib590.c
@@ -69,4 +69,3 @@ int test(char *URL)
 
   return (int)res;
 }
-
diff --git a/tests/libtest/lib598.c b/tests/libtest/lib598.c
index c27e60b14..bd544701e 100644
--- a/tests/libtest/lib598.c
+++ b/tests/libtest/lib598.c
@@ -70,4 +70,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/libauthretry.c b/tests/libtest/libauthretry.c
index e9dc0508b..8e348ad19 100644
--- a/tests/libtest/libauthretry.c
+++ b/tests/libtest/libauthretry.c
@@ -145,4 +145,3 @@ test_cleanup:
 
   return (int)res;
 }
-
diff --git a/tests/libtest/sethostname.h b/tests/libtest/sethostname.h
index 1a1c0775b..7a590428b 100644
--- a/tests/libtest/sethostname.h
+++ b/tests/libtest/sethostname.h
@@ -38,4 +38,3 @@
 
 LIBHOSTNAME_EXTERN int FUNCALLCONV
   gethostname(char *name, GETHOSTNAME_TYPE_ARG2 namelen);
-
diff --git a/tests/libtest/stub_gssapi.h b/tests/libtest/stub_gssapi.h
index 9a302f0f5..95726d794 100644
--- a/tests/libtest/stub_gssapi.h
+++ b/tests/libtest/stub_gssapi.h
@@ -180,4 +180,3 @@ OM_uint32 gss_display_status(OM_uint32 * /*minor_status*/,
                              gss_buffer_t /*status_string*/);
 
 #endif /* HEADER_CURL_GSSAPI_STUBS_H */
-
diff --git a/tests/libtest/testtrace.c b/tests/libtest/testtrace.c
index 3f9eedd80..0a98d006f 100644
--- a/tests/libtest/testtrace.c
+++ b/tests/libtest/testtrace.c
@@ -142,4 +142,3 @@ int libtest_debug_cb(CURL *handle, curl_infotype type,
   libtest_debug_dump(timebuf, text, stderr, data, size, trace_cfg->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;                              \
   }
-
diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 2b4087d58..5cda3900f 100644
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -626,4 +626,3 @@ clean:
 	@if exist $(LIB_DIROBJ) rd /s/q $(LIB_DIROBJ)
 	@if exist $(CURL_DIROBJ)rd /s/q $(CURL_DIROBJ)
 	@if exist $(DIRDIST) rd /s/q $(DIRDIST)
-
author	Viktor Szakats <commit@vszakats.net>	2018-09-23 22:24:02 +0000
committer	Viktor Szakats <commit@vszakats.net>	2018-09-23 22:24:02 +0000
commit	b801b453af6de75838c3298137628f05e94ffb48 (patch)
tree	77dd34603bdf79dc248eb180849aec0aec9d2421
parent	e407e79c2937b6710ac823f64f36ac0c622f33ce (diff)
download	curl-b801b453af6de75838c3298137628f05e94ffb48.tar.gz