httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dgau...@hyperreal.org
Subject cvs commit: apache-1.3/src/modules/standard mod_autoindex.c
Date Wed, 15 Apr 1998 17:09:30 GMT
dgaudet     98/04/15 10:09:30

  Modified:    src      CHANGES
               src/include conf.h
               src/main alloc.c
               src/modules/proxy proxy_cache.c
               src/modules/standard mod_autoindex.c
  Log:
  clean up warnings on ultrix
  
  Submitted by:	Ben Hyde
  
  Revision  Changes    Path
  1.768     +2 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.767
  retrieving revision 1.768
  diff -u -r1.767 -r1.768
  --- CHANGES	1998/04/12 15:49:25	1.767
  +++ CHANGES	1998/04/15 17:09:25	1.768
  @@ -1,4 +1,6 @@
   Changes with Apache 1.3b6
  +
  +  *) PORT: Clean up warnings on Ultrix.  [Ben Hyde]
    
     *) Adding DSO support for the HP/UX platform by emulating the dlopen-style
        interface via the similar but proprietary HP/UX shl_xxx-style system
  
  
  
  1.201     +6 -0      apache-1.3/src/include/conf.h
  
  Index: conf.h
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v
  retrieving revision 1.200
  retrieving revision 1.201
  diff -u -r1.200 -r1.201
  --- conf.h	1998/04/09 08:20:24	1.200
  +++ conf.h	1998/04/15 17:09:27	1.201
  @@ -965,6 +965,12 @@
   #define ap_select	select
   #endif
   
  +#ifdef ULTRIX_BRAIN_DEATH
  +#define ap_fdopen(d,m) fdopen((d), (char *)(m))
  +#else
  +#define ap_fdopen(d,m) fdopen((d), (m))
  +#endif
  +
   #ifndef ap_inet_addr
   #define ap_inet_addr inet_addr
   #endif
  
  
  
  1.88      +6 -6      apache-1.3/src/main/alloc.c
  
  Index: alloc.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/main/alloc.c,v
  retrieving revision 1.87
  retrieving revision 1.88
  diff -u -r1.87 -r1.88
  --- alloc.c	1998/04/11 12:00:28	1.87
  +++ alloc.c	1998/04/15 17:09:28	1.88
  @@ -1557,7 +1557,7 @@
   		    modeFlags);
   	if (desc >= 0) {
   	    desc = ap_slack(desc, AP_SLACK_LOW);
  -	    fd = fdopen(desc, mode);
  +	    fd = ap_fdopen(desc, mode);
   	}
       }
       else {
  @@ -1575,7 +1575,7 @@
       FILE *f;
   
       ap_block_alarms();
  -    f = fdopen(fd, mode);
  +    f = ap_fdopen(fd, mode);
       if (f != NULL)
   	ap_note_cleanups_for_file(a, f);
       ap_unblock_alarms();
  @@ -1753,7 +1753,7 @@
   #define os_pipe(fds) pipe(fds)
   #endif /* WIN32 */
   
  -/* for fdopen, to get binary mode */
  +/* for ap_fdopen, to get binary mode */
   #if defined (__EMX__) || defined (WIN32)
   #define BINMODE	"b"
   #else
  @@ -1969,7 +1969,7 @@
       }
   
       if (pipe_out) {
  -	*pipe_out = fdopen(fd_out, "r" BINMODE);
  +	*pipe_out = ap_fdopen(fd_out, "r" BINMODE);
   	if (*pipe_out)
   	    ap_note_cleanups_for_file(p, *pipe_out);
   	else
  @@ -1977,7 +1977,7 @@
       }
   
       if (pipe_in) {
  -	*pipe_in = fdopen(fd_in, "w" BINMODE);
  +	*pipe_in = ap_fdopen(fd_in, "w" BINMODE);
   	if (*pipe_in)
   	    ap_note_cleanups_for_file(p, *pipe_in);
   	else
  @@ -1985,7 +1985,7 @@
       }
   
       if (pipe_err) {
  -	*pipe_err = fdopen(fd_err, "r" BINMODE);
  +	*pipe_err = ap_fdopen(fd_err, "r" BINMODE);
   	if (*pipe_err)
   	    ap_note_cleanups_for_file(p, *pipe_err);
   	else
  
  
  
  1.37      +3 -0      apache-1.3/src/modules/proxy/proxy_cache.c
  
  Index: proxy_cache.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/proxy/proxy_cache.c,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- proxy_cache.c	1998/04/11 12:00:39	1.36
  +++ proxy_cache.c	1998/04/15 17:09:29	1.37
  @@ -636,6 +636,9 @@
   int ap_proxy_cache_update(struct cache_req *c, array_header *resp_hdrs,
   		       const int is_HTTP1, int nocache)
   {
  +#ifdef ULTRIX_BRAIN_DEATH
  +  extern char *mktemp(char *template);
  +#endif 
       request_rec *r = c->req;
       char *p;
       int i;
  
  
  
  1.75      +0 -4      apache-1.3/src/modules/standard/mod_autoindex.c
  
  Index: mod_autoindex.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_autoindex.c,v
  retrieving revision 1.74
  retrieving revision 1.75
  diff -u -r1.74 -r1.75
  --- mod_autoindex.c	1998/04/13 18:05:15	1.74
  +++ mod_autoindex.c	1998/04/15 17:09:29	1.75
  @@ -1113,12 +1113,8 @@
   	    p = p->next;
   	}
   
  -#ifdef ULTRIX_BRAIN_DEATH
  -	qsort((void *) ar, num_ent, sizeof(struct ent *), (int (*)) dsortf);
  -#else
   	qsort((void *) ar, num_ent, sizeof(struct ent *),
   	          (int (*)(const void *, const void *)) dsortf);
  -#endif
       }
       output_directories(ar, num_ent, autoindex_conf, r, autoindex_opts, keyid,
   		       direction);
  
  
  

Mime
View raw message