Killing warnings

[privoxy.git] / loaders.c

diff --git a/loaders.c b/loaders.c
index 7036158..75f508f 100644 (file)
--- a/loaders.c
+++ b/loaders.c
@@ -1,4 +1,4 @@
-const char loaders_rcs[] = "$Id: loaders.c,v 1.40 2002/03/08 17:46:04 jongfoster Exp $";
+const char loaders_rcs[] = "$Id: loaders.c,v 1.41 2002/03/12 01:42:50 oes Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loaders.c,v $
@@ -35,6 +35,9 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.40 2002/03/08 17:46:04 jongfoster
  *
  * Revisions   :
  *    $Log: loaders.c,v $
+ *    Revision 1.41  2002/03/12 01:42:50  oes
+ *    Introduced modular filters
+ *
  *    Revision 1.40  2002/03/08 17:46:04  jongfoster
  *    Fixing int/size_t warnings
  *
@@ -310,7 +313,7 @@ void sweep(void)
       fl->active = 0;
    }
 
-   for (csp = clients; csp && (ncsp = csp->next) ; csp = csp->next)
+   for (csp = clients; csp && (NULL != (ncsp = csp->next)) ; csp = csp->next)
    {
       if (ncsp->flags & CSP_FLAG_ACTIVE)
       {
@@ -376,13 +379,13 @@ void sweep(void)
             freez(ncsp);
 
             /* are there any more in sequence after it? */
-            if( !(ncsp = csp->next) )
+            if( (ncsp = csp->next) == NULL)
                break;
          }
       }
    }
 
-   for (fl = files; fl && (nfl = fl->next) ; fl = fl->next)
+   for (fl = files; fl && ((nfl = fl->next) != NULL) ; fl = fl->next)
    {
       if ( ( 0 == nfl->active ) && ( NULL != nfl->unloader ) )
       {
@@ -519,7 +522,7 @@ jb_err simple_read_line(FILE *fp, char **dest, int *newline)
 #define CHAR_CR '\r' /* ASCII 13 */
 #define CHAR_LF '\n' /* ASCII 10 */
 
-   while (FOREVER)
+   for (;;)
    {
       ch = fgetc(fp);
       if (ch == EOF)
@@ -1018,7 +1021,7 @@ int load_trustfile(struct client_state *csp)
          reject = 0;
          p = buf;
          q = p+1;
-         while ((*p++ = *q++))
+         while ((*p++ = *q++) != '\0')
          {
             /* nop */
          }