Fix a clang warning about integers and enums being mixed

diff --git a/loaders.c b/loaders.c
index f277c51..f402406 100644 (file)
--- a/loaders.c
+++ b/loaders.c
@@ -1,4 +1,4 @@
-const char loaders_rcs[] = "$Id: loaders.c,v 1.89 2012/03/09 16:24:36 fabiankeil Exp $";
+const char loaders_rcs[] = "$Id: loaders.c,v 1.90 2012/03/09 17:55:50 fabiankeil Exp $";

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loaders.c,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loaders.c,v $


@@ -81,11 +81,6 @@ static struct file_list *current_re_filterfile[MAX_AF_FILES]  = {
    NULL, NULL, NULL, NULL, NULL
 };
 
    NULL, NULL, NULL, NULL, NULL
 };
 

-/*
- * Pseudo filter type for load_one_re_filterfile
- */
-#define NO_NEW_FILTER -1
-

 
 /*********************************************************************
  *
 
 /*********************************************************************
  *


@@ -1152,7 +1147,7 @@ int load_one_re_filterfile(struct client_state *csp, int fileid)
     */
    while (read_config_line(fp, &linenum, &buf) != NULL)
    {
     */
    while (read_config_line(fp, &linenum, &buf) != NULL)
    {

-      int new_filter = NO_NEW_FILTER;
+      enum filter_type new_filter = FT_INVALID_FILTER;

 
       if (strncmp(buf, "FILTER:", 7) == 0)
       {
 
       if (strncmp(buf, "FILTER:", 7) == 0)
       {


@@ -1179,7 +1174,7 @@ int load_one_re_filterfile(struct client_state *csp, int fileid)
        * If this is the head of a new filter block, make it a
        * re_filterfile spec of its own and chain it to the list:
        */
        * If this is the head of a new filter block, make it a
        * re_filterfile spec of its own and chain it to the list:
        */

-      if (new_filter != NO_NEW_FILTER)
+      if (new_filter != FT_INVALID_FILTER)

       {
          new_bl = (struct re_filterfile_spec  *)zalloc(sizeof(*bl));
          if (new_bl == NULL)
       {
          new_bl = (struct re_filterfile_spec  *)zalloc(sizeof(*bl));
          if (new_bl == NULL)

diff --git a/project.h b/project.h
index f7142ad..a5e2a32 100644 (file)
--- a/project.h
+++ b/project.h
@@ -1,7 +1,7 @@
 #ifndef PROJECT_H_INCLUDED
 #define PROJECT_H_INCLUDED
 /** Version string. */
 #ifndef PROJECT_H_INCLUDED
 #define PROJECT_H_INCLUDED
 /** Version string. */

-#define PROJECT_H_VERSION "$Id: project.h,v 1.174 2012/03/04 11:50:32 fabiankeil Exp $"
+#define PROJECT_H_VERSION "$Id: project.h,v 1.175 2012/03/04 11:51:25 fabiankeil Exp $"

 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/project.h,v $
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/project.h,v $


@@ -1098,6 +1098,7 @@ enum filter_type
    FT_SERVER_HEADER_FILTER = 2,
    FT_CLIENT_HEADER_TAGGER = 3,
    FT_SERVER_HEADER_TAGGER = 4,
    FT_SERVER_HEADER_FILTER = 2,
    FT_CLIENT_HEADER_TAGGER = 3,
    FT_SERVER_HEADER_TAGGER = 4,

+   FT_INVALID_FILTER       = 42,

 };
 #define MAX_FILTER_TYPES        5
 
 };
 #define MAX_FILTER_TYPES        5