diff options
| author | Yang Tse <yangsita@gmail.com> | 2009-06-04 23:55:56 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2009-06-04 23:55:56 +0000 |
| commit | 1c2947581b8694b3e8ab447c5c7c2c9dbb43bf8b (patch) | |
| tree | 6d4b450593c27037e70e22d5976be76db2192781 /lib/base64.c | |
| parent | 00883822be245d2660a569e6bde38892b9433aa2 (diff) | |
| download | curl-1c2947581b8694b3e8ab447c5c7c2c9dbb43bf8b.tar.gz | |
fix shadowing of a global declaration
Diffstat (limited to 'lib/base64.c')
| -rw-r--r-- | lib/base64.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/base64.c b/lib/base64.c index 4cc7ae9f6..042caef71 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 */ |