From ac18b471d253f8d5c69d1044a59753f32bcd663f Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Sun, 17 Aug 2008 00:25:38 +0000 Subject: [PATCH] libcurl internal base64.h header file renamed to curl_base64.h --- lib/Makefile.Watcom | 10 +++++----- lib/Makefile.inc | 4 ++-- lib/base64.c | 4 ++-- lib/{base64.h => curl_base64.h} | 6 +++--- lib/http.c | 2 +- lib/http_digest.c | 2 +- lib/http_negotiate.c | 2 +- lib/http_ntlm.c | 2 +- lib/krb4.c | 2 +- lib/krb5.c | 3 ++- lib/ldap.c | 4 ++-- lib/security.c | 2 +- tests/server/getpart.c | 2 +- 13 files changed, 23 insertions(+), 22 deletions(-) rename lib/{base64.h => curl_base64.h} (91%) diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom index 5088875ae..5158b23c3 100644 --- a/lib/Makefile.Watcom +++ b/lib/Makefile.Watcom @@ -118,7 +118,7 @@ $(OBJ_DIR)\base64.obj: base64.c setup.h config-win32.h ..\include\curl\curlbuild ..\include\curl\curlrules.h ..\include\curl\easy.h & ..\include\curl\multi.h urldata.h cookie.h ..\include\curl\curl.h & formdata.h timeval.h http_chunks.h hostip.h hash.h llist.h splay.h & - easyif.h base64.h memory.h memdebug.h + easyif.h curl_base64.h memory.h memdebug.h $(OBJ_DIR)\hostip.obj: hostip.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\curlrules.h setup_once.h urldata.h cookie.h & ..\include\curl\curl.h ..\include\curl\curlver.h & @@ -154,7 +154,7 @@ $(OBJ_DIR)\http.obj: http.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\curlrules.h ..\include\curl\easy.h & ..\include\curl\multi.h ..\include\curl\curl.h formdata.h timeval.h & http_chunks.h hostip.h hash.h llist.h splay.h transfer.h sendf.h & - easyif.h progress.h base64.h strequal.h sslgen.h http_digest.h & + easyif.h progress.h curl_base64.h strequal.h sslgen.h http_digest.h & http_ntlm.h http_negotiate.h url.h share.h http.h memory.h select.h & parsedate.h strtoofft.h multiif.h ..\include\curl\mprintf.h memdebug.h $(OBJ_DIR)\sendf.obj: sendf.c setup.h config-win32.h ..\include\curl\curlbuild.h & @@ -206,7 +206,7 @@ $(OBJ_DIR)\ldap.obj: ldap.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\curlrules.h ..\include\curl\easy.h & ..\include\curl\multi.h ..\include\curl\curl.h formdata.h timeval.h & http_chunks.h hostip.h hash.h llist.h splay.h sendf.h escape.h & - transfer.h strequal.h strtok.h curl_ldap.h memory.h base64.h & + transfer.h strequal.h strtok.h curl_ldap.h memory.h curl_base64.h & ..\include\curl\mprintf.h memdebug.h $(OBJ_DIR)\ssluse.obj: ssluse.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\curlrules.h setup_once.h urldata.h cookie.h & @@ -343,7 +343,7 @@ $(OBJ_DIR)\http_digest.obj: http_digest.c setup.h config-win32.h & ..\include\curl\curlrules.h ..\include\curl\easy.h & ..\include\curl\multi.h ..\include\curl\curl.h formdata.h timeval.h & http_chunks.h hostip.h hash.h llist.h splay.h sendf.h strequal.h & - base64.h curl_md5.h http_digest.h strtok.h url.h memory.h easyif.h & + curl_base64.h curl_md5.h http_digest.h strtok.h url.h memory.h easyif.h & ..\include\curl\mprintf.h memdebug.h $(OBJ_DIR)\md5.obj: md5.c setup.h config-win32.h ..\include\curl\curlbuild.h & ..\include\curl\curlrules.h setup_once.h curl_md5.h @@ -355,7 +355,7 @@ $(OBJ_DIR)\http_ntlm.obj: http_ntlm.c setup.h config-win32.h & ..\include\curl\curlrules.h ..\include\curl\easy.h & ..\include\curl\multi.h ..\include\curl\curl.h formdata.h timeval.h & http_chunks.h hostip.h hash.h llist.h splay.h easyif.h sendf.h & - strequal.h base64.h http_ntlm.h url.h memory.h ssluse.h & + strequal.h curl_base64.h http_ntlm.h url.h memory.h ssluse.h & ..\include\curl\mprintf.h memdebug.h $(OBJ_DIR)\inet_pton.obj: inet_pton.c setup.h config-win32.h & ..\include\curl\curlbuild.h ..\include\curl\curlrules.h setup_once.h & diff --git a/lib/Makefile.inc b/lib/Makefile.inc index 414e1d342..8cb9a7425 100644 --- a/lib/Makefile.inc +++ b/lib/Makefile.inc @@ -11,7 +11,7 @@ CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.c \ inet_ntop.c parsedate.c select.c gtls.c sslgen.c tftp.c splay.c \ strdup.c socks.c ssh.c nss.c qssl.c -HHEADERS = arpa_telnet.h netrc.h file.h timeval.h base64.h hostip.h \ +HHEADERS = arpa_telnet.h netrc.h file.h timeval.h qssl.h hostip.h \ progress.h formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h \ if2ip.h speedcheck.h urldata.h curl_ldap.h ssluse.h escape.h telnet.h \ getinfo.h strequal.h krb4.h memdebug.h inet_ntoa_r.h http_chunks.h \ @@ -20,4 +20,4 @@ HHEADERS = arpa_telnet.h netrc.h file.h timeval.h base64.h hostip.h \ strtoofft.h strerror.h inet_ntop.h curlx.h memory.h setup.h \ transfer.h select.h easyif.h multiif.h parsedate.h sslgen.h gtls.h \ tftp.h sockaddr.h splay.h strdup.h setup_once.h socks.h ssh.h nssg.h \ - qssl.h + curl_base64.h diff --git a/lib/base64.c b/lib/base64.c index 9edc83212..6b9331083 100644 --- a/lib/base64.c +++ b/lib/base64.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2007, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2008, 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 @@ -42,7 +42,7 @@ #include "urldata.h" /* for the SessionHandle definition */ #include "easyif.h" /* for Curl_convert_... prototypes */ -#include "base64.h" +#include "curl_base64.h" #include "memory.h" /* include memdebug.h last */ diff --git a/lib/base64.h b/lib/curl_base64.h similarity index 91% rename from lib/base64.h rename to lib/curl_base64.h index 59742bcd3..c98fd196c 100644 --- a/lib/base64.h +++ b/lib/curl_base64.h @@ -1,5 +1,5 @@ -#ifndef __BASE64_H -#define __BASE64_H +#ifndef __CURL_BASE64_H +#define __CURL_BASE64_H /*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2007, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2008, 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 diff --git a/lib/http.c b/lib/http.c index 42aa45718..fde46dd0e 100644 --- a/lib/http.c +++ b/lib/http.c @@ -81,7 +81,7 @@ #include "easyif.h" /* for Curl_convert_... prototypes */ #include "formdata.h" #include "progress.h" -#include "base64.h" +#include "curl_base64.h" #include "cookie.h" #include "strequal.h" #include "sslgen.h" diff --git a/lib/http_digest.c b/lib/http_digest.c index 0132a84e3..82096c3f7 100644 --- a/lib/http_digest.c +++ b/lib/http_digest.c @@ -33,7 +33,7 @@ #include "urldata.h" #include "sendf.h" #include "strequal.h" -#include "base64.h" +#include "curl_base64.h" #include "curl_md5.h" #include "http_digest.h" #include "strtok.h" diff --git a/lib/http_negotiate.c b/lib/http_negotiate.c index d47c9aecd..80c00a171 100644 --- a/lib/http_negotiate.c +++ b/lib/http_negotiate.c @@ -38,7 +38,7 @@ #include "urldata.h" #include "sendf.h" #include "strequal.h" -#include "base64.h" +#include "curl_base64.h" #include "http_negotiate.h" #include "memory.h" diff --git a/lib/http_ntlm.c b/lib/http_ntlm.c index 89e5f962c..ebc8e73f2 100644 --- a/lib/http_ntlm.c +++ b/lib/http_ntlm.c @@ -56,7 +56,7 @@ #include "easyif.h" /* for Curl_convert_... prototypes */ #include "sendf.h" #include "strequal.h" -#include "base64.h" +#include "curl_base64.h" #include "http_ntlm.h" #include "url.h" #include "memory.h" diff --git a/lib/krb4.c b/lib/krb4.c index 42ae753c5..84ce9e6bb 100644 --- a/lib/krb4.c +++ b/lib/krb4.c @@ -58,7 +58,7 @@ #endif #include "urldata.h" -#include "base64.h" +#include "curl_base64.h" #include "ftp.h" #include "sendf.h" #include "krb4.h" diff --git a/lib/krb5.c b/lib/krb5.c index 552ea25dc..5b921d9c0 100644 --- a/lib/krb5.c +++ b/lib/krb5.c @@ -2,6 +2,7 @@ * * Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Högskolan * (Royal Institute of Technology, Stockholm, Sweden). + * Copyright (c) 2004 - 2008 Daniel Stenberg * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -56,7 +57,7 @@ #endif #include "urldata.h" -#include "base64.h" +#include "curl_base64.h" #include "ftp.h" #include "sendf.h" #include "krb4.h" diff --git a/lib/ldap.c b/lib/ldap.c index 4f5625c40..816b46faf 100644 --- a/lib/ldap.c +++ b/lib/ldap.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2007, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2008, 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 @@ -74,7 +74,7 @@ #include "strtok.h" #include "curl_ldap.h" #include "memory.h" -#include "base64.h" +#include "curl_base64.h" #define _MPRINTF_REPLACE /* use our functions only */ #include diff --git a/lib/security.c b/lib/security.c index da1e2fdde..bec751045 100644 --- a/lib/security.c +++ b/lib/security.c @@ -62,7 +62,7 @@ #include "urldata.h" #include "krb4.h" -#include "base64.h" +#include "curl_base64.h" #include "sendf.h" #include "ftp.h" #include "memory.h" diff --git a/tests/server/getpart.c b/tests/server/getpart.c index 0b327030b..72a6d0f6d 100644 --- a/tests/server/getpart.c +++ b/tests/server/getpart.c @@ -33,7 +33,7 @@ struct SessionHandle { int fake; }; -#include "base64.h" +#include "curl_base64.h" /* include memdebug.h last */ #include "memdebug.h"