diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base64.c | 2 | ||||
| -rw-r--r-- | lib/formdata.c | 4 | ||||
| -rw-r--r-- | lib/md5.c | 22 | ||||
| -rw-r--r-- | lib/md5.h | 2 | ||||
| -rw-r--r-- | lib/mprintf.c | 10 | ||||
| -rw-r--r-- | lib/security.c | 6 | ||||
| -rw-r--r-- | lib/urldata.h | 2 |
7 files changed, 24 insertions, 24 deletions
diff --git a/lib/base64.c b/lib/base64.c index 2416bca06..7cb66c5c4 100644 --- a/lib/base64.c +++ b/lib/base64.c @@ -110,7 +110,7 @@ size_t Curl_base64_decode(const char *src, char *dest) } /* ---- Base64 Encoding --- */ -static char table64[]= +static const char table64[]= "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; /* diff --git a/lib/formdata.c b/lib/formdata.c index fa26ebbe5..07e5a0ddf 100644 --- a/lib/formdata.c +++ b/lib/formdata.c @@ -261,7 +261,7 @@ static const char * ContentTypeForFilename (const char *filename, const char *extension; const char *type; }; - static struct ContentType ctts[]={ + static const struct ContentType ctts[]={ {".gif", "image/gif"}, {".jpg", "image/jpeg"}, {".jpeg", "image/jpeg"}, @@ -1543,7 +1543,7 @@ char *Curl_FormBoundary(void) the same form won't be identical */ size_t i; - static char table16[]="abcdef0123456789"; + static const char table16[]="abcdef0123456789"; retstring = (char *)malloc(BOUNDARY_LENGTH+1); @@ -25,7 +25,7 @@ #ifndef CURL_DISABLE_CRYPTO_AUTH -#ifndef USE_SSLEAY +#if !defined(USE_SSLEAY) || !defined(USE_OPENSSL) /* This code segment is only used if OpenSSL is not provided, as if it is we use the MD5-function provided there instead. No good duplicating code! */ @@ -67,7 +67,7 @@ struct md5_ctx { typedef struct md5_ctx MD5_CTX; static void MD5_Init(struct md5_ctx *); -static void MD5_Update(struct md5_ctx *, unsigned char *, unsigned int); +static void MD5_Update(struct md5_ctx *, const unsigned char *, unsigned int); static void MD5_Final(unsigned char [16], struct md5_ctx *); /* Constants for MD5Transform routine. @@ -90,11 +90,11 @@ static void MD5_Final(unsigned char [16], struct md5_ctx *); #define S43 15 #define S44 21 -static void MD5Transform(UINT4 [4], unsigned char [64]); +static void MD5Transform(UINT4 [4], const unsigned char [64]); static void Encode(unsigned char *, UINT4 *, unsigned int); -static void Decode(UINT4 *, unsigned char *, unsigned int); +static void Decode(UINT4 *, const unsigned char *, unsigned int); -static unsigned char PADDING[64] = { +static const unsigned char PADDING[64] = { 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 @@ -151,9 +151,9 @@ static void MD5_Init(struct md5_ctx *context) operation, processing another message block, and updating the context. */ -static void MD5_Update (struct md5_ctx *context, /* context */ - unsigned char *input, /* input block */ - unsigned int inputLen)/* length of input block */ +static void MD5_Update (struct md5_ctx *context, /* context */ + const unsigned char *input, /* input block */ + unsigned int inputLen) /* length of input block */ { unsigned int i, bufindex, partLen; @@ -214,7 +214,7 @@ static void MD5_Final(unsigned char digest[16], /* message digest */ /* MD5 basic transformation. Transforms state based on block. */ static void MD5Transform(UINT4 state[4], - unsigned char block[64]) + const unsigned char block[64]) { UINT4 a = state[0], b = state[1], c = state[2], d = state[3], x[16]; @@ -322,7 +322,7 @@ static void Encode (unsigned char *output, a multiple of 4. */ static void Decode (UINT4 *output, - unsigned char *input, + const unsigned char *input, unsigned int len) { unsigned int i, j; @@ -341,7 +341,7 @@ static void Decode (UINT4 *output, #include "md5.h" void Curl_md5it(unsigned char *outbuffer, /* 16 bytes */ - unsigned char *input) + const unsigned char *input) { MD5_CTX ctx; MD5_Init(&ctx); @@ -24,6 +24,6 @@ ***************************************************************************/ void Curl_md5it(unsigned char *output, - unsigned char *input); + const unsigned char *input); #endif diff --git a/lib/mprintf.c b/lib/mprintf.c index 56bede316..30f0f7aa5 100644 --- a/lib/mprintf.c +++ b/lib/mprintf.c @@ -816,8 +816,8 @@ static int dprintf_formatf( case FORMAT_STRING: /* String. */ { - static char null[] = "(nil)"; - char *str; + static const char null[] = "(nil)"; + const char *str; size_t len; str = (char *) p->data.str; @@ -830,7 +830,7 @@ static int dprintf_formatf( p->flags &= (~FLAGS_ALT); } else { - str = (char *)""; + str = ""; len = 0; } } @@ -875,8 +875,8 @@ static int dprintf_formatf( } else { /* Write "(nil)" for a nil pointer. */ - static char strnil[] = "(nil)"; - char *point; + static const char strnil[] = "(nil)"; + const char *point; width -= sizeof(strnil) - 1; if (p->flags & FLAGS_LEFT) diff --git a/lib/security.c b/lib/security.c index e87a5144b..f34729b55 100644 --- a/lib/security.c +++ b/lib/security.c @@ -65,7 +65,7 @@ #define min(a, b) ((a) < (b) ? (a) : (b)) -static struct { +static const struct { enum protection_level level; const char *name; } level_names[] = { @@ -85,7 +85,7 @@ name_to_level(const char *name) return (enum protection_level)-1; } -static struct Curl_sec_client_mech *mechs[] = { +static const struct Curl_sec_client_mech *mechs[] = { #ifdef KRB5 /* not supported */ #endif @@ -400,7 +400,7 @@ int Curl_sec_login(struct connectdata *conn) { int ret; - struct Curl_sec_client_mech **m; + const struct Curl_sec_client_mech **m; ssize_t nread; struct SessionHandle *data=conn->data; int ftpcode; diff --git a/lib/urldata.h b/lib/urldata.h index a58a9e47d..64c8a1d8f 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -573,7 +573,7 @@ struct connectdata { int sec_complete; void *app_data; - struct Curl_sec_client_mech *mech; + const struct Curl_sec_client_mech *mech; struct sockaddr_in local_addr; #endif |