From a07bc79117971b96ebf3188c0a34a73ee0a3609b Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Sun, 14 Feb 2010 19:40:18 +0000 Subject: removed trailing whitespace --- lib/CMakeLists.txt | 2 +- lib/Makefile.am | 2 +- lib/Makefile.riscos | 2 +- lib/Makefile.vxworks | 4 ++-- lib/README.ares | 10 +++++----- lib/README.curlx | 8 ++++---- lib/README.encoding | 6 +++--- lib/README.memoryleak | 8 ++++---- lib/arpa_telnet.h | 26 ++++++++++++++------------ lib/curl_addrinfo.h | 4 ++-- lib/curl_md5.h | 18 +++++++++--------- lib/curl_sspi.h | 4 ++-- lib/curl_threads.c | 2 +- lib/firefox-db2pem.sh | 6 +++--- lib/getinfo.h | 18 +++++++++--------- lib/hostip4.c | 4 ++-- lib/http_negotiate.h | 24 ++++++++++++------------ lib/mk-ca-bundle.pl | 6 +++--- lib/netrc.c | 4 ++-- lib/netrc.h | 19 ++++++++++--------- lib/setup-os400.h | 10 +++++----- lib/setup.h | 6 +++--- lib/speedcheck.h | 18 +++++++++--------- lib/strdup.h | 19 +++++++++---------- lib/strtok.h | 19 +++++++++---------- lib/strtoofft.h | 11 +++++------ 26 files changed, 130 insertions(+), 130 deletions(-) (limited to 'lib') diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 372c86995..aec1a3c5b 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -57,7 +57,7 @@ if(HAVE_FEATURES_H) nonblock.c hash.c http.c - if2ip.c + if2ip.c mprintf.c multi.c sendf.c diff --git a/lib/Makefile.am b/lib/Makefile.am index 2140b30f4..42e80662e 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -95,7 +95,7 @@ endif # # Here's the simplified rule guide on how to change -version-info: # (current version is C:R:A) -# +# # 1. if there are only source changes, use C:R+1:A # 2. if interfaces were added use C+1:0:A+1 # 3. if interfaces were removed, then use C+1:0:0 diff --git a/lib/Makefile.riscos b/lib/Makefile.riscos index 56472aeb1..57475e4d0 100644 --- a/lib/Makefile.riscos +++ b/lib/Makefile.riscos @@ -20,7 +20,7 @@ objs = o.base64 o.connect o.cookie o.dict \ # Compile options: linkopts = -o libcurl -compileropts = -mpoke-function-name -IUtilLib: -mthrowback +compileropts = -mpoke-function-name -IUtilLib: -mthrowback # Project target: libcurl: $(objs) diff --git a/lib/Makefile.vxworks b/lib/Makefile.vxworks index a1f9f82ae..f58494f5f 100644 --- a/lib/Makefile.vxworks +++ b/lib/Makefile.vxworks @@ -43,14 +43,14 @@ ARES_LIB := # ---------------------------------------------------------------------- -# Compiler +# Compiler # ---------------------------------------------------------------------- CC := ccppc AR := arppc LINK := ccppc CFLAGS := -D__GNUC__ -D__ppc__ -msoft-float -fno-builtin -mcpu=604 -mlongcall -DCPU=PPC604 -D_GNU_TOOL -Wall -W -Winline $(USER_CFLAGS) -LDFLAGS := -nostdlib -Wl,-i -Wl,-X +LDFLAGS := -nostdlib -Wl,-i -Wl,-X INCLUDE_FLAG := -I C_DEBUGFLAG := -g C_OPTFLAG := -O2 diff --git a/lib/README.ares b/lib/README.ares index b94a16611..cf6a1206a 100644 --- a/lib/README.ares +++ b/lib/README.ares @@ -1,14 +1,14 @@ $Id$ - _ _ ____ _ - ___| | | | _ \| | - / __| | | | |_) | | - | (__| |_| | _ <| |___ + _ _ ____ _ + ___| | | | _ \| | + / __| | | | |_) | | + | (__| |_| | _ <| |___ \___|\___/|_| \_\_____| How To Build libcurl to Use c-ares For Asynch Name Resolves =========================================================== -c-ares: +c-ares: http://daniel.haxx.se/projects/c-ares/ NOTE diff --git a/lib/README.curlx b/lib/README.curlx index 13645cb42..582c43a8b 100644 --- a/lib/README.curlx +++ b/lib/README.curlx @@ -1,8 +1,8 @@ $Id$ - _ _ ____ _ - ___| | | | _ \| | - / __| | | | |_) | | - | (__| |_| | _ <| |___ + _ _ ____ _ + ___| | | | _ \| | + / __| | | | |_) | | + | (__| |_| | _ <| |___ \___|\___/|_| \_\_____| Source Code Functions Apps Might Use diff --git a/lib/README.encoding b/lib/README.encoding index 1666e239e..ca9b4ec55 100644 --- a/lib/README.encoding +++ b/lib/README.encoding @@ -1,7 +1,7 @@ Content Encoding Support for libcurl -* About content encodings: +* About content encodings: HTTP/1.1 [RFC 2616] specifies that a client may request that a server encode its response. This is usually used to compress a response using one of a set @@ -31,9 +31,9 @@ Gallagher, and support for the 'gzip' encoding was added by Dan Fandrich. * The libcurl interface: -To cause libcurl to request a content encoding use: +To cause libcurl to request a content encoding use: - curl_easy_setopt(curl, CURLOPT_ENCODING, ) + curl_easy_setopt(curl, CURLOPT_ENCODING, ) where is the intended value of the Accept-Encoding header. diff --git a/lib/README.memoryleak b/lib/README.memoryleak index 8aa6094fd..0d2f37485 100644 --- a/lib/README.memoryleak +++ b/lib/README.memoryleak @@ -1,8 +1,8 @@ $Id$ - _ _ ____ _ - ___| | | | _ \| | - / __| | | | |_) | | - | (__| |_| | _ <| |___ + _ _ ____ _ + ___| | | | _ \| | + / __| | | | |_) | | + | (__| |_| | _ <| |___ \___|\___/|_| \_\_____| How To Track Down Suspected Memory Leaks in libcurl diff --git a/lib/arpa_telnet.h b/lib/arpa_telnet.h index edcfb596e..9c574ee15 100644 --- a/lib/arpa_telnet.h +++ b/lib/arpa_telnet.h @@ -1,18 +1,18 @@ -#ifndef __ARPA_TELNET_H -#define __ARPA_TELNET_H +#ifndef HEADER_CURL_ARPA_TELNET_H +#define HEADER_CURL_ARPA_TELNET_H /*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2009, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms * are also available at http://curl.haxx.se/docs/copyright.html. - * + * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is * furnished to do so, under the terms of the COPYING file. @@ -58,12 +58,12 @@ static const char * const telnetoptions[]= #define CURL_TELOPT_OK(x) ((x) <= CURL_TELOPT_MAXIMUM) #define CURL_TELOPT(x) telnetoptions[x] -#define CURL_NTELOPTS 40 +#define CURL_NTELOPTS 40 /* * First some defines */ -#define CURL_xEOF 236 /* End Of File */ +#define CURL_xEOF 236 /* End Of File */ #define CURL_SE 240 /* Sub negotiation End */ #define CURL_NOP 241 /* No OPeration */ #define CURL_DM 242 /* Data Mark */ @@ -97,5 +97,7 @@ static const char * const telnetcmds[]= #define CURL_TELCMD_OK(x) ( ((unsigned int)(x) >= CURL_TELCMD_MINIMUM) && \ ((unsigned int)(x) <= CURL_TELCMD_MAXIMUM) ) #define CURL_TELCMD(x) telnetcmds[(x)-CURL_TELCMD_MINIMUM] -#endif -#endif + +#endif /* CURL_DISABLE_TELNET */ + +#endif /* HEADER_CURL_ARPA_TELNET_H */ diff --git a/lib/curl_addrinfo.h b/lib/curl_addrinfo.h index a7235039f..cf7470370 100644 --- a/lib/curl_addrinfo.h +++ b/lib/curl_addrinfo.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2009, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -45,7 +45,7 @@ #endif -/* +/* * Curl_addrinfo is our internal struct definition that we use to allow * consistent internal handling of this data. We use this even when the * system provides an addrinfo structure definition. And we use this for diff --git a/lib/curl_md5.h b/lib/curl_md5.h index 19c34fb4d..e4da02e7f 100644 --- a/lib/curl_md5.h +++ b/lib/curl_md5.h @@ -1,18 +1,18 @@ -#ifndef __CURL_MD5_H -#define __CURL_MD5_H +#ifndef HEADER_CURL_MD5_H +#define HEADER_CURL_MD5_H /*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2008, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms * are also available at http://curl.haxx.se/docs/copyright.html. - * + * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is * furnished to do so, under the terms of the COPYING file. @@ -26,4 +26,4 @@ void Curl_md5it(unsigned char *output, const unsigned char *input); -#endif +#endif /* HEADER_CURL_MD5_H */ diff --git a/lib/curl_sspi.h b/lib/curl_sspi.h index 87aa380fc..454742117 100644 --- a/lib/curl_sspi.h +++ b/lib/curl_sspi.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2009, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -29,7 +29,7 @@ #include -/* +/* * When including the folowing three headers, it is mandatory to define either * SECURITY_WIN32 or SECURITY_KERNEL, indicating who is compiling the code. */ diff --git a/lib/curl_threads.c b/lib/curl_threads.c index 96304e440..3c3eecd02 100644 --- a/lib/curl_threads.c +++ b/lib/curl_threads.c @@ -45,7 +45,7 @@ struct curl_actual_call { unsigned int (*func)(void *); - void *arg; + void *arg; }; static void *curl_thread_create_thunk(void *arg) diff --git a/lib/firefox-db2pem.sh b/lib/firefox-db2pem.sh index 11f641c91..202549160 100755 --- a/lib/firefox-db2pem.sh +++ b/lib/firefox-db2pem.sh @@ -6,7 +6,7 @@ # * | (__| |_| | _ <| |___ # * \___|\___/|_| \_\_____| # * -# * Copyright (C) 1998 - 2008, Daniel Stenberg, , et al. +# * Copyright (C) 1998 - 2010, Daniel Stenberg, , et al. # * # * This software is licensed as described in the file COPYING, which # * you should have received as part of this distribution. The terms @@ -21,11 +21,11 @@ # * # * $Id$ # *************************************************************************** -# This shell script creates a fresh ca-bundle.crt file for use with libcurl. +# This shell script creates a fresh ca-bundle.crt file for use with libcurl. # It extracts all ca certs it finds in the local Firefox database and converts # them all into PEM format. # -db=`ls -1d $HOME/.mozilla/firefox/*default` +db=`ls -1d $HOME/.mozilla/firefox/*default` out=$1 if test -z "$out"; then diff --git a/lib/getinfo.h b/lib/getinfo.h index 75f556bfc..ca06551ae 100644 --- a/lib/getinfo.h +++ b/lib/getinfo.h @@ -1,18 +1,18 @@ -#ifndef __GETINFO_H -#define __GETINFO_H +#ifndef HEADER_CURL_GETINFO_H +#define HEADER_CURL_GETINFO_H /*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2009, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms * are also available at http://curl.haxx.se/docs/copyright.html. - * + * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is * furnished to do so, under the terms of the COPYING file. @@ -25,4 +25,4 @@ CURLcode Curl_getinfo(struct SessionHandle *data, CURLINFO info, ...); CURLcode Curl_initinfo(struct SessionHandle *data); -#endif +#endif /* HEADER_CURL_GETINFO_H */ diff --git a/lib/hostip4.c b/lib/hostip4.c index 3e5a12d2b..68e589a33 100644 --- a/lib/hostip4.c +++ b/lib/hostip4.c @@ -121,7 +121,7 @@ Curl_addrinfo *Curl_getaddrinfo(struct connectdata *conn, if(!ai) infof(conn->data, "Curl_ipv4_resolve_r failed for %s\n", hostname); - return ai; + return ai; } #endif /* CURLRES_SYNCH */ #endif /* CURLRES_IPV4 */ @@ -149,7 +149,7 @@ Curl_addrinfo *Curl_ipv4_resolve_r(const char *hostname, return Curl_ip2addr(AF_INET, &in, hostname, port); #if defined(HAVE_GETADDRINFO_THREADSAFE) - else { + else { struct addrinfo hints; char sbuf[NI_MAXSERV]; char *sbufptr = NULL; diff --git a/lib/http_negotiate.h b/lib/http_negotiate.h index 669fee586..a5dec7092 100644 --- a/lib/http_negotiate.h +++ b/lib/http_negotiate.h @@ -1,19 +1,18 @@ -#ifndef __HTTP_NEGOTIATE_H -#define __HTTP_NEGOTIATE_H - +#ifndef HEADER_CURL_HTTP_NEGOTIATE_H +#define HEADER_CURL_HTTP_NEGOTIATE_H /*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2004, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms * are also available at http://curl.haxx.se/docs/copyright.html. - * + * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is * furnished to do so, under the terms of the COPYING file. @@ -27,13 +26,14 @@ #ifdef HAVE_GSSAPI /* this is for Negotiate header input */ -int Curl_input_negotiate(struct connectdata *conn, bool proxy, const char *header); +int Curl_input_negotiate(struct connectdata *conn, bool proxy, + const char *header); /* this is for creating Negotiate header output */ CURLcode Curl_output_negotiate(struct connectdata *conn, bool proxy); void Curl_cleanup_negotiate(struct SessionHandle *data); -#endif +#endif /* HAVE_GSSAPI */ -#endif +#endif /* HEADER_CURL_HTTP_NEGOTIATE_H */ diff --git a/lib/mk-ca-bundle.pl b/lib/mk-ca-bundle.pl index 24c892ca7..99a096a09 100755 --- a/lib/mk-ca-bundle.pl +++ b/lib/mk-ca-bundle.pl @@ -6,7 +6,7 @@ # * | (__| |_| | _ <| |___ # * \___|\___/|_| \_\_____| # * -# * Copyright (C) 1998 - 2008, Daniel Stenberg, , et al. +# * Copyright (C) 1998 - 2010, Daniel Stenberg, , et al. # * # * This software is licensed as described in the file COPYING, which # * you should have received as part of this distribution. The terms @@ -21,7 +21,7 @@ # * # * $Id$ # *************************************************************************** -# This Perl script creates a fresh ca-bundle.crt file for use with libcurl. +# This Perl script creates a fresh ca-bundle.crt file for use with libcurl. # It downloads certdata.txt from Mozilla's source tree (see URL below), # then parses certdata.txt and extracts CA Root Certificates into PEM format. # These are then processed with the OpenSSL commandline tool to produce the @@ -35,7 +35,7 @@ use Getopt::Std; use MIME::Base64; use LWP::UserAgent; use strict; -use vars qw($opt_b $opt_h $opt_i $opt_l $opt_n $opt_q $opt_t $opt_u $opt_v); +use vars qw($opt_b $opt_h $opt_i $opt_l $opt_n $opt_q $opt_t $opt_u $opt_v); my $url = 'http://mxr.mozilla.org/seamonkey/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1'; # If the OpenSSL commandline is not in search path you can configure it here! diff --git a/lib/netrc.c b/lib/netrc.c index a5dc8f408..2b41946d5 100644 --- a/lib/netrc.c +++ b/lib/netrc.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2009, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -145,7 +145,7 @@ int Curl_parsenetrc(const char *host, bool done=FALSE; char netrcbuffer[256]; int netrcbuffsize = (int)sizeof(netrcbuffer); - + while(!done && fgets(netrcbuffer, netrcbuffsize, file)) { tok=strtok_r(netrcbuffer, " \t\n", &tok_buf); while(!done && tok) { diff --git a/lib/netrc.h b/lib/netrc.h index a82b3fc35..e6df41941 100644 --- a/lib/netrc.h +++ b/lib/netrc.h @@ -1,18 +1,18 @@ -#ifndef __NETRC_H -#define __NETRC_H +#ifndef HEADER_CURL_NETRC_H +#define HEADER_CURL_NETRC_H /*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2004, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms * are also available at http://curl.haxx.se/docs/copyright.html. - * + * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is * furnished to do so, under the terms of the COPYING file. @@ -31,4 +31,5 @@ int Curl_parsenetrc(const char *host, * in the netrc. * If login[0] != 0, search for password within machine and login. */ -#endif + +#endif /* HEADER_CURL_NETRC_H */ diff --git a/lib/setup-os400.h b/lib/setup-os400.h index 636ee7fa2..6ac96b992 100644 --- a/lib/setup-os400.h +++ b/lib/setup-os400.h @@ -1,5 +1,5 @@ -#ifndef __SETUP_OS400_H -#define __SETUP_OS400_H +#ifndef HEADER_CURL_SETUP_OS400_H +#define HEADER_CURL_SETUP_OS400_H /*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2009, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -94,7 +94,7 @@ extern OM_uint32 Curl_gss_init_sec_context_a(OM_uint32 * minor_status, gss_flags_t req_flags, OM_uint32 time_req, gss_channel_bindings_t - input_chan_bindings, + input_chan_bindings, gss_buffer_t input_token, gss_OID * actual_mech_type, gss_buffer_t output_token, @@ -138,4 +138,4 @@ extern int Curl_os400_recvfrom(int sd, char * buffer, int buflen, int flags, #define recvfrom Curl_os400_recvfrom -#endif /* __SETUP_OS400_H */ +#endif /* HEADER_CURL_SETUP_OS400_H */ diff --git a/lib/setup.h b/lib/setup.h index ced3face5..6c19cbcda 100644 --- a/lib/setup.h +++ b/lib/setup.h @@ -1,5 +1,5 @@ -#ifndef __LIB_CURL_SETUP_H -#define __LIB_CURL_SETUP_H +#ifndef HEADER_CURL_LIB_SETUP_H +#define HEADER_CURL_LIB_SETUP_H /*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | @@ -549,4 +549,4 @@ int netware_init(void); #include "setup_once.h" #endif -#endif /* __LIB_CURL_SETUP_H */ +#endif /* HEADER_CURL_LIB_SETUP_H */ diff --git a/lib/speedcheck.h b/lib/speedcheck.h index fda964c9e..2789e8c5a 100644 --- a/lib/speedcheck.h +++ b/lib/speedcheck.h @@ -1,18 +1,18 @@ -#ifndef __SPEEDCHECK_H -#define __SPEEDCHECK_H +#ifndef HEADER_CURL_SPEEDCHECK_H +#define HEADER_CURL_SPEEDCHECK_H /*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2009, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms * are also available at http://curl.haxx.se/docs/copyright.html. - * + * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is * furnished to do so, under the terms of the COPYING file. @@ -31,4 +31,4 @@ void Curl_speedinit(struct SessionHandle *data); CURLcode Curl_speedcheck(struct SessionHandle *data, struct timeval now); -#endif +#endif /* HEADER_CURL_SPEEDCHECK_H */ diff --git a/lib/strdup.h b/lib/strdup.h index 07681ac12..51886bd09 100644 --- a/lib/strdup.h +++ b/lib/strdup.h @@ -1,18 +1,18 @@ -#ifndef __CURL_STRDUP_H -#define __CURL_STRDUP_H +#ifndef HEADER_CURL_STRDUP_H +#define HEADER_CURL_STRDUP_H /*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2008, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms * are also available at http://curl.haxx.se/docs/copyright.html. - * + * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is * furnished to do so, under the terms of the COPYING file. @@ -28,5 +28,4 @@ extern char *curlx_strdup(const char *str); #endif -#endif - +#endif /* HEADER_CURL_STRDUP_H */ diff --git a/lib/strtok.h b/lib/strtok.h index 8cb8e694f..6380e4327 100644 --- a/lib/strtok.h +++ b/lib/strtok.h @@ -1,18 +1,18 @@ -#ifndef __CURL_STRTOK_H -#define __CURL_STRTOK_H +#ifndef HEADER_CURL_STRTOK_H +#define HEADER_CURL_STRTOK_H /*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2008, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms * are also available at http://curl.haxx.se/docs/copyright.html. - * + * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is * furnished to do so, under the terms of the COPYING file. @@ -32,5 +32,4 @@ char *Curl_strtok_r(char *s, const char *delim, char **last); #include #endif -#endif - +#endif /* HEADER_CURL_STRTOK_H */ diff --git a/lib/strtoofft.h b/lib/strtoofft.h index 6d7a14930..82f25fe56 100644 --- a/lib/strtoofft.h +++ b/lib/strtoofft.h @@ -1,5 +1,5 @@ -#ifndef _CURL_STRTOOFFT_H -#define _CURL_STRTOOFFT_H +#ifndef HEADER_CURL_STRTOOFFT_H +#define HEADER_CURL_STRTOOFFT_H /*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2008, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2010, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -30,7 +30,7 @@ * to implement string conversion to our curl_off_t integral data type. * * Notice that curl_off_t might be 64 or 32 bit wide, and that it might use - * an undelying data type which might be 'long', 'int64_t', 'long long' or + * an undelying data type which might be 'long', 'int64_t', 'long long' or * '__int64' and more remotely other data types. * * On systems where the size of curl_off_t is greater than the size of 'long' @@ -61,5 +61,4 @@ #define CURL_LLONG_MAX CURL_OFF_T_C(0x7FFFFFFFFFFFFFFF) #define CURL_LLONG_MIN (-CURL_LLONG_MAX - CURL_OFF_T_C(1)) -#endif - +#endif /* HEADER_CURL_STRTOOFFT_H */ -- cgit v1.2.3