httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b..@hyperreal.org
Subject cvs commit: apache-2.0/src/lib/apr/lib apr_fnmatch.c apr_pools.c apr_snprintf.c
Date Sun, 12 Sep 1999 10:52:18 GMT
ben         99/09/12 03:52:18

  Modified:    src/lib/apr/file_io/unix filedup.c open.c readwrite.c
               src/lib/apr/include apr_lib.h
               src/lib/apr/lib apr_fnmatch.c apr_pools.c apr_snprintf.c
  Log:
  Fix warnings.
  
  Revision  Changes    Path
  1.2       +2 -0      apache-2.0/src/lib/apr/file_io/unix/filedup.c
  
  Index: filedup.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/src/lib/apr/file_io/unix/filedup.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- filedup.c	1999/08/17 15:59:36	1.1
  +++ filedup.c	1999/09/12 10:52:13	1.2
  @@ -86,6 +86,8 @@
               case O_RDWR:
                   buf_oflags = "r+";
                   break;
  +	    default:
  +		return APR_BADARG;
           }
           (*new_file)->filehand = freopen(old_file->fname, buf_oflags, 
                                           old_file->filehand); 
  
  
  
  1.9       +1 -3      apache-2.0/src/lib/apr/file_io/unix/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/src/lib/apr/file_io/unix/open.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- open.c	1999/09/11 20:42:58	1.8
  +++ open.c	1999/09/12 10:52:14	1.9
  @@ -106,7 +106,6 @@
   ap_status_t ap_open(ap_context_t *cont, const char *fname, ap_int32_t flag,  ap_fileperms_t
perm, struct file_t **new)
   {
       int oflags = 0;
  -    struct stat info;
       mode_t mode = get_fileperms(perm);    
       char *buf_oflags;
   
  @@ -266,7 +265,6 @@
    */
   ap_status_t ap_eof(ap_file_t *fptr)
   {
  -    char ch;
       if (fptr->buffered) {
           if (feof(fptr->filehand) == 0) {
               return APR_SUCCESS;
  @@ -276,6 +274,6 @@
       if (fptr->eof_hit == 1) {
           return APR_EOF;
       }
  -    APR_SUCCESS;
  +    return APR_SUCCESS;
   }   
   
  
  
  
  1.7       +0 -2      apache-2.0/src/lib/apr/file_io/unix/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/src/lib/apr/file_io/unix/readwrite.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- readwrite.c	1999/09/11 15:48:46	1.6
  +++ readwrite.c	1999/09/12 10:52:14	1.7
  @@ -194,8 +194,6 @@
    */
   ap_status_t ap_ungetc(ap_file_t *thefile, char ch)
   {
  -    ssize_t rv;
  -    
       if (thefile->buffered) {
           if (ungetc(ch, thefile->filehand) == ch) {
               thefile->stated = 0;
  
  
  
  1.8       +2 -2      apache-2.0/src/lib/apr/include/apr_lib.h
  
  Index: apr_lib.h
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/src/lib/apr/include/apr_lib.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- apr_lib.h	1999/09/08 18:04:10	1.7
  +++ apr_lib.h	1999/09/12 10:52:16	1.8
  @@ -399,8 +399,8 @@
    */
   
   /*#ifdef TPF*/
  -#define ap_block_alarms() (0)
  -#define ap_unblock_alarms() (0)
  +#define ap_block_alarms()
  +#define ap_unblock_alarms()
   /*#else 
   API_EXPORT(void) ap_block_alarms(void);
   API_EXPORT(void) ap_unblock_alarms(void);
  
  
  
  1.3       +3 -0      apache-2.0/src/lib/apr/lib/apr_fnmatch.c
  
  Index: apr_fnmatch.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/src/lib/apr/lib/apr_fnmatch.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- apr_fnmatch.c	1999/08/31 05:32:34	1.2
  +++ apr_fnmatch.c	1999/09/12 10:52:17	1.3
  @@ -48,6 +48,9 @@
   #include "apr_fnmatch.h"
   #include "apr_lib.h"
   #include <string.h>
  +#ifdef HAVE_CTYPE_H
  +# include <ctype.h>
  +#endif
   
   #define	EOS	'\0'
   
  
  
  
  1.9       +1 -1      apache-2.0/src/lib/apr/lib/apr_pools.c
  
  Index: apr_pools.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/src/lib/apr/lib/apr_pools.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- apr_pools.c	1999/09/08 19:56:21	1.8
  +++ apr_pools.c	1999/09/12 10:52:17	1.9
  @@ -802,7 +802,6 @@
   
       blok = a->last;
       first_avail = blok->h.first_avail;
  -    new_first_avail;
   
       if (reqsize <= 0) {
   	return NULL;
  @@ -1174,6 +1173,7 @@
   API_EXPORT_NONSTD(ap_status_t) ap_null_cleanup(void *data)
   {
       /* do nothing cleanup routine */
  +    return APR_SUCCESS;
   }
   
   /*
  
  
  
  1.2       +3 -0      apache-2.0/src/lib/apr/lib/apr_snprintf.c
  
  Index: apr_snprintf.c
  ===================================================================
  RCS file: /export/home/cvs/apache-2.0/src/lib/apr/lib/apr_snprintf.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- apr_snprintf.c	1999/08/17 15:59:38	1.1
  +++ apr_snprintf.c	1999/09/12 10:52:17	1.2
  @@ -67,6 +67,9 @@
   
   #include "apr_lib.h"
   #include <math.h>
  +#ifdef HAVE_CTYPE_H
  +# include <ctype.h>
  +#endif
   
   typedef enum {
       NO = 0, YES = 1
  
  
  

Mime
View raw message