CVS diff for config.l between 1.5 and 1.4:

Revision 1.4 Revision 1.5
Line 8 Line 8
#define VARMATCH(varname) (0 == strncmp(yytext, varname, strlen(varname))) 
 
enum svar { none, sroot, port, hands, verb, maxcon, maxdur, alog, 
#define VARMATCH(varname) (0 == strncmp(yytext, varname, strlen(varname))) 
 
enum svar { none, sroot, port, hands, verb, maxcon, maxdur, alog, 
                elog, allmime, defmime, unknown }; 
                elog, allmime, defmime, disnagle, unknown }; 
 
int yyerror(char*); 
void set_var(enum svar, char*); 
 
int yyerror(char*); 
void set_var(enum svar, char*); 
Line 24 Line 24
    int ka_max_dur; 
int max_handler; 
int verbose = 0; 
    int ka_max_dur; 
int max_handler; 
int verbose = 0; 
 
    int disable_nagle = 0; 
 
/* TODO: Why are these here? They should be elsewhere... */ 
int cow_rto_s; /* cow read/recv timeout in sec */ 
 
/* TODO: Why are these here? They should be elsewhere... */ 
int cow_rto_s; /* cow read/recv timeout in sec */ 
Line 58 Line 59
                    else if (VARMATCH("ErrorLog"))          curvar = elog; 
else if (VARMATCH("GlobalMime")) curvar = allmime; 
else if (VARMATCH("DefaultMime")) curvar = defmime; 
                    else if (VARMATCH("ErrorLog"))          curvar = elog; 
else if (VARMATCH("GlobalMime")) curvar = allmime; 
else if (VARMATCH("DefaultMime")) curvar = defmime; 
 
                    else if (VARMATCH("DisableNagle"))      curvar = disnagle; 
                    else { curvar = unknown; yyerror("Unrecognized variable"); } 

 
                    else { curvar = unknown; yyerror("Unrecognized variable"); } 

 
Line 197 Line 199
        case defmime: 
default_mime = strdup(val); 
break; 
        case defmime: 
default_mime = strdup(val); 
break; 
 
        case disnagle:
            disable_nagle = atoi(val);
            break; 
        default: 
yyerror("FIXME: Config file parser needs to be updated!"); 
        default: 
yyerror("FIXME: Config file parser needs to be updated!"); 
Line 214 Line 219
    return 1; 

 
    return 1; 

 


Legend
Lines deleted from 1.5  
Lines Modified
  Lines added in revision 1.4