moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

fix shadowing of a global declaration

Browse Source
This commit is contained in:
Yang Tse 2009-06-04 23:55:56 +00:00
parent 00883822be
commit 1c2947581b
4 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/base64.c
View File

@ -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 * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * 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, 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 ibuf[3];
unsigned char obuf[4]; unsigned char obuf[4];
@ -153,7 +154,7 @@ size_t Curl_base64_encode(struct SessionHandle *data,
char *convbuf = NULL; char *convbuf = NULL;
#endif #endif
const char *indata = inp; const char *indata = inputbuff;
*outptr = NULL; /* set to NULL in case of failure before we reach the end */ *outptr = NULL; /* set to NULL in case of failure before we reach the end */

16
lib/curl_base64.h
View File

@ -1,5 +1,5 @@
#ifndef __CURL_BASE64_H #ifndef HEADER_CURL_BASE64_H
#define __CURL_BASE64_H #define HEADER_CURL_BASE64_H
/*************************************************************************** /***************************************************************************
* _ _ ____ _ * _ _ ____ _
* Project ___| | | | _ \| | * 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 * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -22,7 +22,11 @@
* *
* $Id$ * $Id$
***************************************************************************/ ***************************************************************************/
size_t Curl_base64_encode(struct SessionHandle *data, size_t Curl_base64_encode(struct SessionHandle *data,
const char *input, size_t size, char **str); const char *inputbuff, size_t insize,
size_t Curl_base64_decode(const char *source, unsigned char **outptr); char **outptr);
#endif
size_t Curl_base64_decode(const char *src, unsigned char **outptr);
#endif /* HEADER_CURL_BASE64_H */

6
lib/dict.c
View File

@ -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 * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * 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 */ 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 *newp;
char *dictp; char *dictp;
@ -121,7 +121,7 @@ static char *unescape_word(struct SessionHandle *data, const char *inp)
char byte; char byte;
int olen=0; int olen=0;
newp = curl_easy_unescape(data, inp, 0, &len); newp = curl_easy_unescape(data, inputbuff, 0, &len);
if(!newp) if(!newp)
return NULL; return NULL;

11
lib/dict.h
View File

@ -1,6 +1,5 @@
#ifndef __DICT_H #ifndef HEADER_CURL_DICT_H
#define __DICT_H #define HEADER_CURL_DICT_H
/*************************************************************************** /***************************************************************************
* _ _ ____ _ * _ _ ____ _
* Project ___| | | | _ \| | * 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 * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -23,7 +22,9 @@
* *
* $Id$ * $Id$
***************************************************************************/ ***************************************************************************/
#ifndef CURL_DISABLE_DICT #ifndef CURL_DISABLE_DICT
extern const struct Curl_handler Curl_handler_dict; extern const struct Curl_handler Curl_handler_dict;
#endif #endif
#endif
#endif /* HEADER_CURL_DICT_H */