From: <no...@so...> - 2006-12-28 18:04:30
|
Update of /cvsroot/ijbswa/current In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv2362 Modified Files: cgiedit.c Log Message: Fixed gcc43 conversion warnings. Index: cgiedit.c =================================================================== RCS file: /cvsroot/ijbswa/current/cgiedit.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- cgiedit.c 27 Dec 2006 18:44:52 -0000 1.46 +++ cgiedit.c 28 Dec 2006 18:04:25 -0000 1.47 @@ -42,6 +42,9 @@ * * Revisions : * $Log$ + * Revision 1.47 2006/12/28 18:04:25 fabiankeil + * Fixed gcc43 conversion warnings. + * * Revision 1.46 2006/12/27 18:44:52 fabiankeil * Stop shadowing string.h's index(). * @@ -998,7 +1001,7 @@ { /* Must quote '#' characters */ int numhash = 0; - int len; + size_t len; char * src; char * dest; char * str; @@ -1014,7 +1017,7 @@ /* Allocate new memory for string */ len = strlen(cur_line->unprocessed); - if (NULL == (str = malloc((size_t) len + 1 + numhash))) + if (NULL == (str = malloc(len + 1 + (size_t)numhash))) { /* Uh oh, just trashed file! */ fclose(fp); @@ -1296,7 +1299,7 @@ name_end--; } - name_len = name_end - line + 1; /* Length excluding \0 */ + name_len = (size_t)(name_end - line) + 1; /* Length excluding \0 */ if (NULL == (*pname = (char *) malloc(name_len + 1))) { return JB_ERR_MEMORY; @@ -1992,7 +1995,7 @@ char *name; char *fullpath; char ch; - int len; + size_t len; assert(csp); assert(parameters); @@ -2249,7 +2252,7 @@ } } - *p = value; + *p = (char)value; return map(exports, buf, 0, "checked", 1); } |