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/lib/apr/lib apr_execve.c apr_pools.c apr_tables.c
Date Tue, 23 Nov 1999 21:23:05 GMT
rbb         99/11/23 13:22:55

  Modified:    src/lib/apr/lib apr_execve.c apr_pools.c apr_tables.c
  Log:
  This removes all of the fprintf calls from APR, except for those which
  are made during debugging.
  
  Revision  Changes    Path
  1.5       +0 -1      apache-2.0/src/lib/apr/lib/apr_execve.c
  
  Index: apr_execve.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_execve.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- apr_execve.c	1999/11/22 18:01:14	1.4
  +++ apr_execve.c	1999/11/23 21:22:45	1.5
  @@ -349,7 +349,6 @@
   	    newargv = (char **) malloc((p - lbuf + 1)
                         + (i + sargc + 1) * sizeof(*newargv));
   	    if (newargv == NULL) {
  -		fprintf(stderr, "Ouch!  Out of memory in hashbang()!\n");
   		return NULL;
   	    }
   	    ws = &((char *) newargv)[(i + sargc + 1) * sizeof(*newargv)];
  
  
  
  1.21      +1 -7      apache-2.0/src/lib/apr/lib/apr_pools.c
  
  Index: apr_pools.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_pools.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- apr_pools.c	1999/10/29 21:52:32	1.20
  +++ apr_pools.c	1999/11/23 21:22:47	1.21
  @@ -268,8 +268,7 @@
   
       blok = (union block_hdr *) malloc(size + sizeof(union block_hdr));
       if (blok == NULL) {
  -	fprintf(stderr, "Ouch!  malloc failed in malloc_block()\n");
  -	exit(1);
  +        return NULL;
       }
       debug_fill(blok, size + sizeof(union block_hdr));
       blok->h.next = NULL;
  @@ -299,7 +298,6 @@
   			"at the end of a block!\n");
       while (free_blk) {
   	if (free_blk == blok) {
  -	    fprintf(stderr, "Ouch!  Freeing free block\n");
   	    abort();
   	    exit(1);
   	}
  @@ -685,9 +683,6 @@
   	b = *pb;
   	if (is_ptr_in_range(s, b, b->h.endp)) {
   	    if (b->h.owning_pool == FREE_POOL) {
  -		fprintf(stderr,
  -			"Ouch!  find_pool() called on pointer "
  -			"in a free block\n");
   		abort();
   		exit(1);
   	    }
  @@ -739,7 +734,6 @@
   
       /* We could handle more general cases... but this is it for now. */
       if (sub->parent != p) {
  -	fprintf(stderr, "pool_join: p is not parent of sub\n");
   	abort();
       }
       ap_block_alarms();
  
  
  
  1.6       +1 -3      apache-2.0/src/lib/apr/lib/apr_tables.c
  
  Index: apr_tables.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_tables.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- apr_tables.c	1999/10/17 16:11:43	1.5
  +++ apr_tables.c	1999/11/23 21:22:48	1.6
  @@ -284,9 +284,7 @@
   static ap_table_entry_t *table_push(ap_table_t *t)
   {
       if (t->a.nelts == t->a.nalloc) {
  -	fprintf(stderr,
  -		"table_push: ap_table_t created by %p hit limit of %u\n",
  -		t->creator, t->a.nalloc);
  +        return NULL;
       }
       return (ap_table_entry_t *) ap_push_array(&t->a);
   }
  
  
  

Mime
View raw message