httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-2.0/src/modules/standard mod_negotiation.c
Date Mon, 04 Oct 1999 17:24:57 GMT
rbb         99/10/04 10:24:55

  Modified:    src/lib/apr/file_io/unix readwrite.c
               src/lib/apr/file_io/win32 readwrite.c
               src/lib/apr/include apr_file_io.h
               src/main util.c
               src/modules/standard mod_negotiation.c
  Log:
  Simple name change.  the function ap_gets has been renamed to ap_fgets.
  This is more in-line with what the function does, and how it acts, so
  it makes sense.
  
  Revision  Changes    Path
  1.9       +2 -2      apache-2.0/src/lib/apr/file_io/unix/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/readwrite.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- readwrite.c	1999/09/12 10:54:37	1.8
  +++ readwrite.c	1999/10/04 17:24:28	1.9
  @@ -289,13 +289,13 @@
   }
   
   /* ***APRDOC********************************************************
  - * ap_status_t ap_gets(ap_file_t *, char *, int)
  + * ap_status_t ap_fgets(ap_file_t *, char *, int)
    *    Get a string from a specified file.
    * arg 1) The file descriptor to read from
    * arg 2) The buffer to store the string in. 
    * arg 3) The length of the string
    */
  -ap_status_t ap_gets(ap_file_t *thefile, char *str, int len)
  +ap_status_t ap_fgets(ap_file_t *thefile, char *str, int len)
   {
       ssize_t rv;
       int i;    
  
  
  
  1.4       +1 -1      apache-2.0/src/lib/apr/file_io/win32/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/readwrite.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- readwrite.c	1999/09/30 21:10:15	1.3
  +++ readwrite.c	1999/10/04 17:24:31	1.4
  @@ -201,7 +201,7 @@
       return APR_SUCCESS; 
   }
   
  -ap_status_t ap_gets(ap_file_t *thefile, char *str, int len)
  +ap_status_t ap_fgets(ap_file_t *thefile, char *str, int len)
   {
       DWORD bread;
       int i;
  
  
  
  1.7       +1 -1      apache-2.0/src/lib/apr/include/apr_file_io.h
  
  Index: apr_file_io.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_file_io.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- apr_file_io.h	1999/10/04 16:36:54	1.6
  +++ apr_file_io.h	1999/10/04 17:24:35	1.7
  @@ -118,7 +118,7 @@
   ap_status_t ap_putc(ap_file_t *, char);
   ap_status_t ap_getc(ap_file_t *, char *);
   ap_status_t ap_ungetc(ap_file_t *, char);
  -ap_status_t ap_gets(ap_file_t *, char *, int);
  +ap_status_t ap_fgets(ap_file_t *, char *, int);
   ap_status_t ap_puts(ap_file_t *, char *);
   ap_status_t ap_flush(ap_file_t *);
   API_EXPORT(int) ap_fprintf(ap_file_t *fptr, const char *format, ...)
  
  
  
  1.11      +1 -1      apache-2.0/src/main/util.c
  
  Index: util.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- util.c	1999/10/04 16:37:55	1.10
  +++ util.c	1999/10/04 17:24:43	1.11
  @@ -857,7 +857,7 @@
   static void *cfg_getstr(void *buf, size_t bufsiz, void *param)
   {
       ap_file_t *cfp = (ap_file_t *) param;
  -    if (ap_gets(cfp, buf, bufsiz) == APR_SUCCESS)
  +    if (ap_fgets(cfp, buf, bufsiz) == APR_SUCCESS)
           return buf;
       return NULL;
   }
  
  
  
  1.7       +1 -1      apache-2.0/src/modules/standard/mod_negotiation.c
  
  Index: mod_negotiation.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_negotiation.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_negotiation.c	1999/10/04 16:38:16	1.6
  +++ mod_negotiation.c	1999/10/04 17:24:52	1.7
  @@ -644,7 +644,7 @@
       /* Get a noncommented line */
   
       do {
  -        if (ap_gets(map, buffer, MAX_STRING_LEN) != APR_SUCCESS) {
  +        if (ap_fgets(map, buffer, MAX_STRING_LEN) != APR_SUCCESS) {
               return header_eof;
           }
       } while (buffer[0] == '#');
  
  
  

Mime
View raw message