diff --git a/lib/ftp.c b/lib/ftp.c index d940a12e0..ca8ef1135 100644 --- a/lib/ftp.c +++ b/lib/ftp.c @@ -880,7 +880,7 @@ static CURLcode ftp_state_use_port(struct connectdata *conn, char hbuf[NI_MAXHOST]; struct sockaddr *sa=(struct sockaddr *)&ss; char tmp[1024]; - static const char * const mode[] = { "EPRT", "PORT", NULL }; + static const char mode[][5] = { "EPRT", "PORT" }; int rc; int error; char *host=NULL; @@ -1266,7 +1266,7 @@ static CURLcode ftp_state_use_pasv(struct connectdata *conn) */ - static const char * const mode[] = { "EPSV", "PASV", NULL }; + static const char mode[][5] = { "EPSV", "PASV" }; int modeoff; #ifdef PF_INET6 @@ -2550,9 +2550,7 @@ static CURLcode ftp_statemach_act(struct connectdata *conn) struct SessionHandle *data=conn->data; int ftpcode; struct ftp_conn *ftpc = &conn->proto.ftpc; - static const char * const ftpauth[] = { - "SSL", "TLS" - }; + static const char ftpauth[][4] = { "SSL", "TLS" }; size_t nread = 0; if(ftpc->sendleft) { diff --git a/lib/parsedate.c b/lib/parsedate.c index ef2ee658b..786ab7ff4 100644 --- a/lib/parsedate.c +++ b/lib/parsedate.c @@ -96,7 +96,7 @@ const char * const Curl_month[]= "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; struct tzinfo { - const char *name; + char name[5]; int offset; /* +/- in minutes */ }; diff --git a/lib/sendf.c b/lib/sendf.c index 4d17ec133..7a8c3cad2 100644 --- a/lib/sendf.c +++ b/lib/sendf.c @@ -661,7 +661,7 @@ int Curl_read(struct connectdata *conn, /* connection data */ static int showit(struct SessionHandle *data, curl_infotype type, char *ptr, size_t size) { - static const char * const s_infotype[CURLINFO_END] = { + static const char s_infotype[CURLINFO_END][3] = { "* ", "< ", "> ", "{ ", "} ", "{ ", "} " }; #ifdef CURL_DOES_CONVERSIONS diff --git a/lib/ssh.c b/lib/ssh.c index 19b685f30..32057a3c4 100644 --- a/lib/ssh.c +++ b/lib/ssh.c @@ -2469,7 +2469,7 @@ get_pathname(const char **cpp, char **path) const char *cp = *cpp, *end; char quot; unsigned int i, j; - static const char * const WHITESPACE = " \t\r\n"; + static const char WHITESPACE[] = " \t\r\n"; cp += strspn(cp, WHITESPACE); if(!*cp) {