From 1c2947581b8694b3e8ab447c5c7c2c9dbb43bf8b Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Thu, 4 Jun 2009 23:55:56 +0000
Subject: [PATCH] fix shadowing of a global declaration
---
lib/base64.c | 7 ++++---
lib/curl_base64.h | 16 ++++++++++------
lib/dict.c | 6 +++---
lib/dict.h | 11 ++++++-----
4 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/lib/base64.c b/lib/base64.c
index 4cc7ae9f62..042caef71e 100644
--- a/lib/base64.c
+++ b/lib/base64.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -141,7 +141,8 @@ size_t Curl_base64_decode(const char *src, unsigned char **outptr)
*
*/
size_t Curl_base64_encode(struct SessionHandle *data,
- const char *inp, size_t insize, char **outptr)
+ const char *inputbuff, size_t insize,
+ char **outptr)
{
unsigned char ibuf[3];
unsigned char obuf[4];
@@ -153,7 +154,7 @@ size_t Curl_base64_encode(struct SessionHandle *data,
char *convbuf = NULL;
#endif
- const char *indata = inp;
+ const char *indata = inputbuff;
*outptr = NULL; /* set to NULL in case of failure before we reach the end */
diff --git a/lib/curl_base64.h b/lib/curl_base64.h
index c98fd196c4..627eb93e3c 100644
--- a/lib/curl_base64.h
+++ b/lib/curl_base64.h
@@ -1,5 +1,5 @@
-#ifndef __CURL_BASE64_H
-#define __CURL_BASE64_H
+#ifndef HEADER_CURL_BASE64_H
+#define HEADER_CURL_BASE64_H
/***************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -22,7 +22,11 @@
*
* $Id$
***************************************************************************/
+
size_t Curl_base64_encode(struct SessionHandle *data,
- const char *input, size_t size, char **str);
-size_t Curl_base64_decode(const char *source, unsigned char **outptr);
-#endif
+ const char *inputbuff, size_t insize,
+ char **outptr);
+
+size_t Curl_base64_decode(const char *src, unsigned char **outptr);
+
+#endif /* HEADER_CURL_BASE64_H */
diff --git a/lib/dict.c b/lib/dict.c
index aa13ebdc94..acf7ef6895 100644
--- a/lib/dict.c
+++ b/lib/dict.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -112,7 +112,7 @@ const struct Curl_handler Curl_handler_dict = {
PROT_DICT /* protocol */
};
-static char *unescape_word(struct SessionHandle *data, const char *inp)
+static char *unescape_word(struct SessionHandle *data, const char *inputbuff)
{
char *newp;
char *dictp;
@@ -121,7 +121,7 @@ static char *unescape_word(struct SessionHandle *data, const char *inp)
char byte;
int olen=0;
- newp = curl_easy_unescape(data, inp, 0, &len);
+ newp = curl_easy_unescape(data, inputbuff, 0, &len);
if(!newp)
return NULL;
diff --git a/lib/dict.h b/lib/dict.h
index eb4fb9d3b9..c1ae6c270f 100644
--- a/lib/dict.h
+++ b/lib/dict.h
@@ -1,6 +1,5 @@
-#ifndef __DICT_H
-#define __DICT_H
-
+#ifndef HEADER_CURL_DICT_H
+#define HEADER_CURL_DICT_H
/***************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
@@ -8,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -23,7 +22,9 @@
*
* $Id$
***************************************************************************/
+
#ifndef CURL_DISABLE_DICT
extern const struct Curl_handler Curl_handler_dict;
#endif
-#endif
+
+#endif /* HEADER_CURL_DICT_H */
--
GitLab