httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dgau...@hyperreal.org
Subject cvs commit: apachen/src/main httpd.h util.c
Date Sun, 26 Oct 1997 21:57:16 GMT
dgaudet     97/10/26 13:57:15

  Modified:    src/main httpd.h util.c
  Log:
  eliminate some -Wshadow warnings
  
  Revision  Changes    Path
  1.165     +3 -3      apachen/src/main/httpd.h
  
  Index: httpd.h
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/main/httpd.h,v
  retrieving revision 1.164
  retrieving revision 1.165
  diff -u -r1.164 -r1.165
  --- httpd.h	1997/10/26 20:19:40	1.164
  +++ httpd.h	1997/10/26 21:57:13	1.165
  @@ -822,9 +822,9 @@
   /* Allocate a configfile_t handle with user defined functions and params */
   API_EXPORT(configfile_t *) pcfg_open_custom(pool *p, const char *descr,
       void *param,
  -    int(*getc)(void*),
  -    void *(*gets) (void *buf, size_t bufsiz, void *param),
  -    int(*close)(void*));
  +    int(*getc_func)(void*),
  +    void *(*gets_func) (void *buf, size_t bufsiz, void *param),
  +    int(*close_func)(void*));
   
   /* Read one line from open configfile_t, strip LF, increase line number */
   API_EXPORT(int) cfg_getline(char *buf, size_t bufsize, configfile_t *cfp);
  
  
  
  1.74      +2 -2      apachen/src/main/util.c
  
  Index: util.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/main/util.c,v
  retrieving revision 1.73
  retrieving revision 1.74
  diff -u -r1.73 -r1.74
  --- util.c	1997/10/26 20:19:40	1.73
  +++ util.c	1997/10/26 21:57:14	1.74
  @@ -691,7 +691,7 @@
       void *param,
       int(*getch)(void*),
       void *(*getstr) (void *buf, size_t bufsiz, void *param),
  -    int(*close)(void*))
  +    int(*close_func)(void*))
   {
       configfile_t *new_cfg = palloc(p, sizeof (*new_cfg));
   #ifdef DEBUG
  @@ -701,7 +701,7 @@
       new_cfg->name = descr;
       new_cfg->getch = getch;
       new_cfg->getstr = getstr;
  -    new_cfg->close = close;
  +    new_cfg->close = close_func;
       new_cfg->line_number = 0;
       return new_cfg;
   }
  
  
  

Mime
View raw message