Sync with sgml.

[privoxy.git] / loaders.c

diff --git a/loaders.c b/loaders.c
index f63b916..8ebfa70 100644 (file)
--- a/loaders.c
+++ b/loaders.c
@@ -1,4 +1,4 @@
-const char loaders_rcs[] = "$Id: loaders.c,v 1.46 2002/03/24 13:25:43 swa Exp $";
+const char loaders_rcs[] = "$Id: loaders.c,v 1.49 2002/04/19 16:53:25 jongfoster Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loaders.c,v $
@@ -35,6 +35,15 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.46 2002/03/24 13:25:43 swa Exp $"
  *
  * Revisions   :
  *    $Log: loaders.c,v $
+ *    Revision 1.49  2002/04/19 16:53:25  jongfoster
+ *    Optimize away a function call by using an equivalent macro
+ *
+ *    Revision 1.48  2002/04/05 00:56:09  gliptak
+ *    Correcting typo to clean up on realloc failure
+ *
+ *    Revision 1.47  2002/03/26 22:29:55  swa
+ *    we have a new homepage!
+ *
  *    Revision 1.46  2002/03/24 13:25:43  swa
  *    name change related issues
  *
@@ -325,6 +334,7 @@ void sweep(void)
 {
    struct file_list *fl, *nfl;
    struct client_state *csp, *ncsp;
+   int i;
 
    /* clear all of the file's active flags */
    for ( fl = files->next; NULL != fl; fl = fl->next )
@@ -345,9 +355,12 @@ void sweep(void)
           */
          ncsp->config->config_file_list->active = 1;
 
-         if (ncsp->actions_list)     /* actions files */
+         for (i = 0; i < MAX_ACTION_FILES; i++)
          {
-            ncsp->actions_list->active = 1;
+            if (ncsp->actions_list[i])     /* actions files */
+            {
+               ncsp->actions_list[i]->active = 1;
+            }
          }
 
          if (ncsp->rlist)     /* pcrsjob files */
@@ -543,7 +556,7 @@ jb_err simple_read_line(FILE *fp, char **dest, int *newline)
 
    for (;;)
    {
-      ch = fgetc(fp);
+      ch = getc(fp);
       if (ch == EOF)
       {
          if (len > 0)
@@ -610,7 +623,7 @@ jb_err simple_read_line(FILE *fp, char **dest, int *newline)
       if (++len >= buflen)
       {
          buflen += BUFFER_SIZE;
-         if (NULL == (p = realloc(buf, buflen)));
+         if (NULL == (p = realloc(buf, buflen)))
          {
             free(buf);
             return JB_ERR_MEMORY;