perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@hyperreal.org
Subject cvs commit: modperl/src/modules/perl Apache.xs mod_perl.c
Date Wed, 24 Jun 1998 18:32:27 GMT
dougm       98/06/24 11:32:26

  Modified:    .        Changes
               src/modules/perl Apache.xs mod_perl.c
  Log:
  add some casts to avoid warnings from const char changes in 1.3.1-dev
  
  Revision  Changes    Path
  1.55      +2 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /export/home/cvs/modperl/Changes,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- Changes	1998/06/23 21:48:46	1.54
  +++ Changes	1998/06/24 18:32:24	1.55
  @@ -8,6 +8,8 @@
   
   =item 1.12_01-dev
   
  +add some casts to avoid warnings from const char changes in 1.3.1-dev
  +
   write_client will break out of it's loop if rwrite returns a -1 error 
   condition, which could cause spinning httpds otherwise
   [Eric Eisenhart <eric@sonic.net>]
  
  
  
  1.35      +8 -8      modperl/src/modules/perl/Apache.xs
  
  Index: Apache.xs
  ===================================================================
  RCS file: /export/home/cvs/modperl/src/modules/perl/Apache.xs,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- Apache.xs	1998/06/23 21:48:47	1.34
  +++ Apache.xs	1998/06/24 18:32:25	1.35
  @@ -313,7 +313,7 @@
   } \
   else { \
       char *val; \
  -    if(table && (val = table_get(table, key))) \
  +    if(table && (val = (char *)table_get(table, key))) \
   	RETVAL = newSVpv(val, 0); \
       else \
           RETVAL = newSV(0); \
  @@ -1162,7 +1162,7 @@
           }
       }
       else if(key) {
  -	char *value = table_get(r->subprocess_env, key);
  +	char *value = (char *)table_get(r->subprocess_env, key);
   	XPUSHs(value ? sv_2mortal((SV*)newSVpv(value, 0)) : &sv_undef);
       }
       else
  @@ -1369,7 +1369,7 @@
       Apache	r
   
       CODE:
  -    RETVAL = r->hostname;
  +    RETVAL = (char *)r->hostname;
   
       OUTPUT:
       RETVAL
  @@ -1556,7 +1556,7 @@
       char *val;
   
       CODE:
  -    if((val = table_get(r->headers_out, key))) 
  +    if((val = (char *)table_get(r->headers_out, key))) 
   	RETVAL = newSVpv(val, 0);
       else
           RETVAL = newSV(0);
  @@ -1681,7 +1681,7 @@
       Apache	r
   
       CODE:
  -    RETVAL = r->content_type;
  +    RETVAL = (char *)r->content_type;
   
       if(items > 1)
           r->content_type = pstrdup(r->pool, SvPV(ST(1), na));
  @@ -1694,7 +1694,7 @@
       Apache	r
   
       CODE:
  -    RETVAL = r->handler;
  +    RETVAL = (char *)r->handler;
   
       if(items > 1)
           r->handler = (ST(1) == &sv_undef) ? 
  @@ -1708,7 +1708,7 @@
       Apache	r
   
       CODE:
  -    RETVAL = r->content_encoding;
  +    RETVAL = (char *)r->content_encoding;
   
       if(items > 1)
         r->content_encoding = pstrdup(r->pool, SvPV(ST(1),na));
  @@ -1721,7 +1721,7 @@
       Apache	r
   
       CODE:
  -    RETVAL = r->content_language;
  +    RETVAL = (char *)r->content_language;
   
       if(items > 1)
           r->content_language = pstrdup(r->pool, SvPV(ST(1),na));
  
  
  
  1.23      +4 -3      modperl/src/modules/perl/mod_perl.c
  
  Index: mod_perl.c
  ===================================================================
  RCS file: /export/home/cvs/modperl/src/modules/perl/mod_perl.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- mod_perl.c	1998/06/17 16:57:59	1.22
  +++ mod_perl.c	1998/06/24 18:32:25	1.23
  @@ -227,7 +227,7 @@
       }
       else {
         if(cld->vars)
  -	  max = table_get(cld->vars, "MaxModPerlRequestsPerChild");
  +	  max = (char *)table_get(cld->vars, "MaxModPerlRequestsPerChild");
       }
   
   #if (MODULE_MAGIC_NUMBER >= 19970912) && !defined(WIN32)
  @@ -943,10 +943,11 @@
   		MP_TRACE_h(fprintf(stderr, 
   				   "pushing `%s' into `%s' handlers\n", 
   				   SvPV(sub,na), hook));
  -	    else
  +	    else {
   		MP_TRACE_d(fprintf(stderr, 
   				   "pushing `%s' into `%s' handlers\n", 
   				   SvPV(sub,na), hook));
  +	    }
   	}
   	else {
   	    warn("mod_perl_push_handlers: Not a subroutine name or CODE reference!");
  @@ -1049,7 +1050,7 @@
   
       /* SetEnv PERL5LIB */
       if(!MP_INCPUSH(cld)) {
  -	char *path = table_get(r->subprocess_env, "PERL5LIB");
  +	char *path = (char *)table_get(r->subprocess_env, "PERL5LIB");
   	if(path) {
   	    perl_incpush(path);
   	    MP_INCPUSH_on(cld);
  
  
  

Mime
View raw message