cvs commit: modperl/src/modules/perl Apache.xs mod_perl.h

[do...@locus.apache.org]

dougm       00/10/03 11:19:14

  Modified:    src/modules/perl Apache.xs mod_perl.h
  Log:
  -Wall cleanups
  
  Revision  Changes    Path
  1.115     +5 -4      modperl/src/modules/perl/Apache.xs
  
  Index: Apache.xs
  ===================================================================
  RCS file: /home/cvs/modperl/src/modules/perl/Apache.xs,v
  retrieving revision 1.114
  retrieving revision 1.115
  diff -u -r1.114 -r1.115
  --- Apache.xs	2000/09/28 19:28:33	1.114
  +++ Apache.xs	2000/10/03 18:19:13	1.115
  @@ -556,6 +556,7 @@
       
       CODE:
       items = items;
  +    ix = ix;
       /*NOOP*/
   
   Apache
  @@ -564,7 +565,7 @@
       Apache r
   
       CODE:
  -    RETVAL = r ? r : perl_request_rec(NULL);
  +    RETVAL = (r && classname) ? r : perl_request_rec(NULL);
   
       OUTPUT:
       RETVAL
  @@ -583,7 +584,7 @@
   
       CODE:
       sv_unmagic((SV*)gv, 'q'); /* untie *STDOUT */
  -    if (arg2) {
  +    if (arg2 && self) {
           arg = newSVsv(arg1);
           sv_catsv(arg, arg2);
       }
  @@ -980,7 +981,7 @@
       r->read_length = 0;
   
       if (should_client_block(r)) {
  -        SvUPGRADE(buffer, SVt_PV);
  +        (void)SvUPGRADE(buffer, SVt_PV);
           SvGROW(buffer, bufsiz+1);
           nrd = get_client_block(r, SvPVX(buffer), bufsiz);
       }
  @@ -1019,7 +1020,7 @@
       long nrd = 0;
   
       PPCODE:
  -    SvUPGRADE(buffer, SVt_PV);
  +    (void)SvUPGRADE(buffer, SVt_PV);
       SvGROW(buffer, bufsiz+1);
       nrd = get_client_block(r, SvPVX(buffer), bufsiz);
       if ( nrd > 0 ) {
  
  
  
  1.105     +13 -0     modperl/src/modules/perl/mod_perl.h
  
  Index: mod_perl.h
  ===================================================================
  RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.h,v
  retrieving revision 1.104
  retrieving revision 1.105
  diff -u -r1.104 -r1.105
  --- mod_perl.h	2000/09/27 23:51:34	1.104
  +++ mod_perl.h	2000/10/03 18:19:14	1.105
  @@ -102,7 +102,15 @@
   #include "perl_PL.h"
   #endif
   #else
  +#define PERL_PATCHLEVEL_H_IMPLICIT /* ignore local_patches */
   #include "patchlevel.h"
  +#undef PERL_PATCHLEVEL_H_IMPLICIT
  +#ifndef PATCHLEVEL
  +#define PATCHLEVEL PERL_VERSION
  +#undef  SUBVERSION
  +#define SUBVERSION PERL_SUBVERSION
  +#endif
  +
   #if ((PATCHLEVEL >= 4) && (SUBVERSION >= 76)) || (PATCHLEVEL >= 5)
   #include "perl_PL.h"
   #endif
  @@ -343,6 +351,11 @@
   extern U32	mp_debug;
   
   #ifdef PERL_TRACE
  +
  +/* -Wall */
  +#undef dNOOP
  +#define dNOOP extern int __attribute__ ((unused)) Perl___notused
  +
   #define MP_TRACE(a)   if (mp_debug)	 a
   #define MP_TRACE_d(a) if (mp_debug & 1)	 a /* directives */
   #define MP_TRACE_s(a) if (mp_debug & 2)	 a /* perl sections */