X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loaders.c;h=585ab75c8a8f81b6d283d11f5262c36714682d12;hp=993aef78c643cb2aa103ea1d736a48a6a2de0de9;hb=bfff1fa911c2739c1fc723beea7d29b50757b8e2;hpb=e37a59aca86ce1f33b5979f7456084b11919b3b7 diff --git a/loaders.c b/loaders.c index 993aef78..585ab75c 100644 --- a/loaders.c +++ b/loaders.c @@ -1,4 +1,4 @@ -const char loaders_rcs[] = "$Id: loaders.c,v 1.37 2002/03/03 15:07:49 oes Exp $"; +const char loaders_rcs[] = "$Id: loaders.c,v 1.39 2002/03/07 03:46:17 oes Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loaders.c,v $ @@ -35,6 +35,12 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.37 2002/03/03 15:07:49 oes Exp $" * * Revisions : * $Log: loaders.c,v $ + * Revision 1.39 2002/03/07 03:46:17 oes + * Fixed compiler warnings + * + * Revision 1.38 2002/03/06 22:54:35 jongfoster + * Automated function-comment nitpicking. + * * Revision 1.37 2002/03/03 15:07:49 oes * Re-enabled automatic config reloading * @@ -489,8 +495,8 @@ int check_file_changed(const struct file_list * current, *********************************************************************/ jb_err simple_read_line(FILE *fp, char **dest, int *newline) { - int len = 0; - int buflen = BUFFER_SIZE; + size_t len = 0; + size_t buflen = BUFFER_SIZE; char * buf; char * p; int ch; @@ -890,7 +896,7 @@ jb_err edit_read_line(FILE *fp, * Otherwise, returns buf. * *********************************************************************/ -char *read_config_line(char *buf, int buflen, FILE *fp, unsigned long *linenum) +char *read_config_line(char *buf, size_t buflen, FILE *fp, unsigned long *linenum) { jb_err err; char *buf2 = NULL; @@ -906,7 +912,7 @@ char *read_config_line(char *buf, int buflen, FILE *fp, unsigned long *linenum) else { assert(buf2); - assert(strlen(buf2) + 1U < (unsigned)buflen); + assert(strlen(buf2) + 1U < buflen); strncpy(buf, buf2, buflen - 1); free(buf2); buf[buflen - 1] = '\0';