Browse Source

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
Viktor Szakats 5 years ago
parent
commit
b801b453af
100 changed files with 432 additions and 520 deletions
  1. 0 1
      CMake/CMakeConfigurableFile.in
  2. 14 14
      Makefile.am
  3. 0 2
      README.md
  4. 2 2
      buildconf.bat
  5. 0 1
      docs/DEPRECATE.md
  6. 0 1
      docs/INSTALL.cmake
  7. 9 9
      docs/MANUAL
  8. 0 1
      docs/Makefile.am
  9. 0 2
      docs/README.netware
  10. 0 2
      docs/README.win32
  11. 1 1
      docs/TheArtOfHttpScripting
  12. 0 1
      docs/cmdline-opts/gen.pl
  13. 0 1
      docs/cmdline-opts/metalink.d
  14. 1 1
      docs/examples/Makefile.am
  15. 110 110
      docs/examples/Makefile.netware
  16. 0 1
      docs/examples/curlgtk.c
  17. 0 1
      docs/examples/makefile.dj
  18. 0 2
      docs/examples/version-check.pl
  19. 80 80
      docs/libcurl/Makefile.inc
  20. 0 1
      docs/libcurl/curl_easy_duphandle.3
  21. 0 1
      docs/libcurl/curl_easy_perform.3
  22. 0 1
      docs/libcurl/curl_easy_reset.3
  23. 0 1
      docs/libcurl/curl_global_init_mem.3
  24. 0 1
      docs/libcurl/curl_multi_init.3
  25. 0 1
      docs/libcurl/curl_multi_timeout.3
  26. 0 1
      docs/libcurl/curl_share_init.3
  27. 0 1
      docs/libcurl/curl_slist_free_all.3
  28. 0 1
      docs/libcurl/curl_version_info.3
  29. 0 1
      docs/libcurl/libcurl-security.3
  30. 1 1
      docs/libcurl/libcurl-tutorial.3
  31. 0 1
      docs/libcurl/opts/CURLMOPT_MAXCONNECTS.3
  32. 1 1
      docs/libcurl/opts/CURLMOPT_PIPELINING_SERVER_BL.3
  33. 0 1
      docs/libcurl/opts/CURLMOPT_SOCKETFUNCTION.3
  34. 1 1
      docs/libcurl/opts/CURLOPT_CONNECTTIMEOUT_MS.3
  35. 1 1
      docs/libcurl/opts/CURLOPT_INFILESIZE_LARGE.3
  36. 0 1
      docs/libcurl/opts/CURLOPT_PASSWORD.3
  37. 0 1
      docs/libcurl/opts/CURLOPT_PATH_AS_IS.3
  38. 0 1
      docs/libcurl/opts/CURLOPT_PRE_PROXY.3
  39. 0 1
      docs/libcurl/opts/CURLOPT_PROXY_SSLVERSION.3
  40. 1 1
      docs/libcurl/opts/CURLOPT_TIMEOUT_MS.3
  41. 2 2
      include/curl/Makefile.am
  42. 0 1
      lib/CMakeLists.txt
  43. 0 1
      lib/Makefile.Watcom
  44. 7 7
      lib/Makefile.am
  45. 32 32
      lib/Makefile.m32
  46. 126 127
      lib/Makefile.netware
  47. 0 1
      lib/amigaos.h
  48. 0 1
      lib/config-dos.h
  49. 0 1
      lib/curl_ldap.h
  50. 0 1
      lib/curl_setup_once.h
  51. 0 1
      lib/curlx.h
  52. 0 1
      lib/easy.c
  53. 0 1
      lib/easyif.h
  54. 0 1
      lib/escape.h
  55. 0 1
      lib/file.h
  56. 0 1
      lib/firefox-db2pem.sh
  57. 0 1
      lib/hostcheck.h
  58. 0 1
      lib/hostip.c
  59. 0 1
      lib/http.h
  60. 0 1
      lib/http2.h
  61. 0 1
      lib/http_chunks.h
  62. 0 1
      lib/inet_ntop.h
  63. 0 1
      lib/inet_pton.h
  64. 0 1
      lib/llist.h
  65. 4 4
      lib/makefile.amiga
  66. 0 1
      lib/makefile.dj
  67. 0 1
      lib/nonblock.h
  68. 0 1
      lib/parsedate.h
  69. 0 1
      lib/progress.h
  70. 0 1
      lib/rtsp.h
  71. 0 1
      lib/select.h
  72. 0 1
      lib/slist.c
  73. 0 1
      lib/slist.h
  74. 0 1
      lib/sockaddr.h
  75. 0 1
      lib/socks.c
  76. 0 1
      lib/socks.h
  77. 0 1
      lib/splay.c
  78. 0 1
      lib/telnet.h
  79. 0 1
      lib/tftp.h
  80. 0 1
      lib/transfer.h
  81. 0 1
      lib/vtls/axtls.h
  82. 0 1
      m4/curl-compilers.m4
  83. 0 2
      m4/curl-confopts.m4
  84. 0 1
      m4/curl-override.m4
  85. 0 1
      m4/curl-reentrant.m4
  86. 0 1
      m4/xc-am-iface.m4
  87. 0 1
      m4/xc-cc-check.m4
  88. 0 1
      m4/xc-lt-iface.m4
  89. 0 1
      m4/xc-translit.m4
  90. 0 1
      m4/xc-val-flgs.m4
  91. 0 1
      m4/zz40-xc-ovr.m4
  92. 0 1
      m4/zz50-xc-ovr.m4
  93. 0 1
      m4/zz60-xc-ovr.m4
  94. 0 1
      packages/AIX/RPM/Makefile.am
  95. 8 9
      packages/Android/Android.mk
  96. 0 1
      packages/Linux/RPM/Makefile.am
  97. 0 1
      packages/Linux/RPM/README
  98. 0 1
      packages/Linux/RPM/curl.spec.in
  99. 31 31
      packages/Makefile.am
  100. 0 1
      packages/NetWare/get_exp.awk

+ 0 - 1
CMake/CMakeConfigurableFile.in

@@ -1,2 +1 @@
 @CMAKE_CONFIGURABLE_FILE_CONTENT@
-

+ 14 - 14
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'; \

+ 0 - 2
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>
-
-

+ 2 - 2
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

+ 0 - 1
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).
-

+ 0 - 1
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.
-

+ 9 - 9
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=*"

+ 0 - 1
docs/Makefile.am

@@ -116,4 +116,3 @@ pdf: $(PDFPAGES)
 
 distclean:
 	rm -f $(CLEANFILES)
-

+ 0 - 2
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.
-
-

+ 0 - 2
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.
-
-

+ 1 - 1
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

+ 0 - 1
docs/cmdline-opts/gen.pl

@@ -388,4 +388,3 @@ sub getargs {
 indexoptions();
 
 getargs();
-

+ 0 - 1
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.
-

+ 1 - 1
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

+ 110 - 110
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

+ 0 - 1
docs/examples/curlgtk.c

@@ -106,4 +106,3 @@ int main(int argc, char **argv)
   gdk_threads_leave();
   return 0;
 }
-

+ 0 - 1
docs/examples/makefile.dj

@@ -53,4 +53,3 @@ clean vclean realclean:
 	- rm -f $(PROGRAMS) depend.dj
 
 -include depend.dj
-

+ 0 - 2
docs/examples/version-check.pl

@@ -101,5 +101,3 @@ for my $w (@recent) {
     }
     last;
 }
-
-

+ 80 - 80
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

+ 0 - 1
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)"
-

+ 0 - 1
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), "
-

+ 0 - 1
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)"
-

+ 0 - 1
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), "
-

+ 0 - 1
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)"
-

+ 0 - 1
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) "
-

+ 0 - 1
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)"
-

+ 0 - 1
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), "
-

+ 0 - 1
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
-

+ 0 - 1
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.
-

+ 1 - 1
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);
 

+ 0 - 1
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), "
-

+ 1 - 1
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.

+ 0 - 1
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) "
-

+ 1 - 1
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), "

+ 1 - 1
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.

+ 0 - 1
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)"
-

+ 0 - 1
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), "
-

+ 0 - 1
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), "
-

+ 0 - 1
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), "
-

+ 1 - 1
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), "

+ 2 - 2
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
 

+ 0 - 1
lib/CMakeLists.txt

@@ -124,4 +124,3 @@ install(EXPORT libcurl-target
         NAMESPACE CURL::
         DESTINATION ${CURL_INSTALL_CMAKE_DIR}
 )
-

+ 0 - 1
lib/Makefile.Watcom

@@ -272,4 +272,3 @@ $(RESOURCE): libcurl.rc
 
 .c{$(OBJ_STAT)}.obj:
 	$(CC) $(CFLAGS) -DCURL_STATICLIB $[@ -fo=$^@
-	

+ 7 - 7
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

+ 32 - 32
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
 
 ########################################################

+ 126 - 127
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 $@
-

+ 0 - 1
lib/amigaos.h

@@ -36,4 +36,3 @@ void Curl_amiga_cleanup();
 #endif
 
 #endif /* HEADER_CURL_AMIGAOS_H */
-

+ 0 - 1
lib/config-dos.h

@@ -181,4 +181,3 @@
 #undef byte
 
 #endif /* HEADER_CURL_CONFIG_DOS_H */
-

+ 0 - 1
lib/curl_ldap.h

@@ -32,4 +32,3 @@ extern const struct Curl_handler Curl_handler_ldaps;
 
 #endif
 #endif /* HEADER_CURL_LDAP_H */
-

+ 0 - 1
lib/curl_setup_once.h

@@ -515,4 +515,3 @@ typedef int sig_atomic_t;
 
 
 #endif /* HEADER_CURL_SETUP_ONCE_H */
-

+ 0 - 1
lib/curlx.h

@@ -102,4 +102,3 @@
 #endif /* ENABLE_CURLX_PRINTF */
 
 #endif /* HEADER_CURL_CURLX_H */
-

+ 0 - 1
lib/easy.c

@@ -1212,4 +1212,3 @@ CURLcode curl_easy_upkeep(struct Curl_easy *data)
     return CURLE_OK;
   }
 }
-

+ 0 - 1
lib/easyif.h

@@ -30,4 +30,3 @@ CURL_EXTERN CURLcode curl_easy_perform_ev(struct Curl_easy *easy);
 #endif
 
 #endif /* HEADER_CURL_EASYIF_H */
-

+ 0 - 1
lib/escape.h

@@ -31,4 +31,3 @@ CURLcode Curl_urldecode(struct Curl_easy *data,
                         bool reject_crlf);
 
 #endif /* HEADER_CURL_ESCAPE_H */
-

+ 0 - 1
lib/file.h

@@ -38,4 +38,3 @@ extern const struct Curl_handler Curl_handler_file;
 #endif
 
 #endif /* HEADER_CURL_FILE_H */
-

+ 0 - 1
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
-

+ 0 - 1
lib/hostcheck.h

@@ -29,4 +29,3 @@
 int Curl_cert_hostcheck(const char *match_pattern, const char *hostname);
 
 #endif /* HEADER_CURL_HOSTCHECK_H */
-

+ 0 - 1
lib/hostip.c

@@ -1109,4 +1109,3 @@ CURLcode Curl_once_resolved(struct connectdata *conn,
 
   return result;
 }
-

+ 0 - 1
lib/http.h

@@ -257,4 +257,3 @@ Curl_http_output_auth(struct connectdata *conn,
                                             up the proxy tunnel */
 
 #endif /* HEADER_CURL_HTTP_H */
-

+ 0 - 1
lib/http2.h

@@ -77,4 +77,3 @@ void Curl_http2_cleanup_dependencies(struct Curl_easy *data);
 #endif
 
 #endif /* HEADER_CURL_HTTP2_H */
-

+ 0 - 1
lib/http_chunks.h

@@ -88,4 +88,3 @@ struct Curl_chunker {
 };
 
 #endif /* HEADER_CURL_HTTP_CHUNKS_H */
-

+ 0 - 1
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 */
-

+ 0 - 1
lib/inet_pton.h

@@ -37,4 +37,3 @@ int Curl_inet_pton(int, const char *, void *);
 #endif
 
 #endif /* HEADER_CURL_INET_PTON_H */
-

+ 0 - 1
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 */
-

+ 4 - 4
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
 

+ 0 - 1
lib/makefile.dj

@@ -69,4 +69,3 @@ realclean vclean: clean
 	- $(DELETE) $(CURL_LIB)
 
 -include depend.dj
-

+ 0 - 1
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 */
-

+ 0 - 1
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 */
-

+ 0 - 1
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 */
-

+ 0 - 1
lib/rtsp.h

@@ -64,4 +64,3 @@ struct RTSP {
 
 
 #endif /* HEADER_CURL_RTSP_H */
-

+ 0 - 1
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 */
-

+ 0 - 1
lib/slist.c

@@ -142,4 +142,3 @@ void curl_slist_free_all(struct curl_slist *list)
     item = next;
   } while(next);
 }
-

+ 0 - 1
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 */
-

+ 0 - 1
lib/sockaddr.h

@@ -40,4 +40,3 @@ struct Curl_sockaddr_storage {
 };
 
 #endif /* HEADER_CURL_SOCKADDR_H */
-

+ 0 - 1
lib/socks.c

@@ -789,4 +789,3 @@ CURLcode Curl_SOCKS5(const char *proxy_user,
 }
 
 #endif /* CURL_DISABLE_PROXY */
-

+ 0 - 1
lib/socks.h

@@ -73,4 +73,3 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
 #endif /* CURL_DISABLE_PROXY */
 
 #endif  /* HEADER_CURL_SOCKS_H */
-

+ 0 - 1
lib/splay.c

@@ -274,4 +274,3 @@ int Curl_splayremovebyaddr(struct Curl_tree *t,
 
   return 0;
 }
-

+ 0 - 1
lib/telnet.h

@@ -26,4 +26,3 @@ extern const struct Curl_handler Curl_handler_telnet;
 #endif
 
 #endif /* HEADER_CURL_TELNET_H */
-

+ 0 - 1
lib/tftp.h

@@ -26,4 +26,3 @@ extern const struct Curl_handler Curl_handler_tftp;
 #endif
 
 #endif /* HEADER_CURL_TFTP_H */
-

+ 0 - 1
lib/transfer.h

@@ -71,4 +71,3 @@ Curl_setup_transfer (struct connectdata *data,
 );
 
 #endif /* HEADER_CURL_TRANSFER_H */
-

+ 0 - 1
lib/vtls/axtls.h

@@ -31,4 +31,3 @@ extern const struct Curl_ssl Curl_ssl_axtls;
 
 #endif /* USE_AXTLS */
 #endif /* HEADER_CURL_AXTLS_H */
-

+ 0 - 1
m4/curl-compilers.m4

@@ -1633,4 +1633,3 @@ AC_DEFUN([CURL_VAR_STRIP], [
   [$1]="$ac_var_stripped"
   squeeze [$1]
 ])
-

+ 0 - 2
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
 ])
-

+ 0 - 1
m4/curl-override.m4

@@ -73,4 +73,3 @@ char $1 ();
 choke me
 #endif
 ], [return $1 ();])])
-

+ 0 - 1
m4/curl-reentrant.m4

@@ -614,4 +614,3 @@ AC_DEFUN([CURL_CONFIGURE_THREAD_SAFE], [
   fi
   #
 ])
-

+ 0 - 1
m4/xc-am-iface.m4

@@ -250,4 +250,3 @@ _XC_AMEND_DISTCLEAN_BODY([$1])
 ])dnl
 m4_define([$0], [])[]dnl
 ])
-

+ 0 - 1
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
 ])
-

+ 0 - 1
m4/xc-lt-iface.m4

@@ -462,4 +462,3 @@ m4_ifdef([LT_INIT],
 dnl
 m4_define([$0],[])dnl
 ])
-

+ 0 - 1
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]))])
-

+ 0 - 1
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
 ])
-

+ 0 - 1
m4/zz40-xc-ovr.m4

@@ -663,4 +663,3 @@ dnl
 m4_pattern_forbid([^_*XC])dnl
 m4_define([$0],[])dnl
 ])
-

+ 0 - 1
m4/zz50-xc-ovr.m4

@@ -57,4 +57,3 @@ dnl provided elsewhere.
 
 AC_DEFUN([XC_OVR_ZZ50],
   [AC_BEFORE([$0],[AC_PROG_LIBTOOL])])
-

+ 0 - 1
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
 ])
-

+ 0 - 1
packages/AIX/RPM/Makefile.am

@@ -1,2 +1 @@
 EXTRA_DIST = README curl.spec.in
-

+ 8 - 9
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)
-

+ 0 - 1
packages/Linux/RPM/Makefile.am

@@ -1,2 +1 @@
 EXTRA_DIST = README curl-ssl.spec.in curl.spec.in make_curl_rpm
-

+ 0 - 1
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.
-

+ 0 - 1
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?.
-

+ 31 - 31
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

+ 0 - 1
packages/NetWare/get_exp.awk

@@ -69,4 +69,3 @@ END {
   }
   printf(" %s\n", exports[++x])
 }
-

Some files were not shown because too many files changed in this diff