cvs commit: modperl-2.0/lib/ModPerl Code.pm

[stas]

stas        2003/10/23 11:34:51

  Modified:    src/modules/perl modperl_config.c
               lib/ModPerl Code.pm
  Log:
  since tracing now automatically appends \n, remove explicit \n lines from trace
  dumps
  
  Revision  Changes    Path
  1.71      +2 -2      modperl-2.0/src/modules/perl/modperl_config.c
  
  Index: modperl_config.c
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_config.c,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -u -r1.70 -r1.71
  --- modperl_config.c  23 Oct 2003 18:16:21 -0000      1.70
  +++ modperl_config.c  23 Oct 2003 18:34:51 -0000      1.71
  @@ -144,9 +144,9 @@
   {
       int i;
       char **argv = (char **)scfg->argv->elts;
  -    modperl_trace(NULL, "modperl_config_srv_argv_init =>\n");
  +    modperl_trace(NULL, "modperl_config_srv_argv_init =>");
       for (i=0; i<scfg->argv->nelts; i++) {
  -        modperl_trace(NULL, "   %d = %s\n", i, argv[i]);
  +        modperl_trace(NULL, "   %d = %s", i, argv[i]);
       }
   }
   #endif
  
  
  
  1.111     +4 -4      modperl-2.0/lib/ModPerl/Code.pm
  
  Index: Code.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/lib/ModPerl/Code.pm,v
  retrieving revision 1.110
  retrieving revision 1.111
  diff -u -u -r1.110 -r1.111
  --- Code.pm   14 Oct 2003 17:32:40 -0000      1.110
  +++ Code.pm   23 Oct 2003 18:34:51 -0000      1.111
  @@ -406,7 +406,7 @@
   
   EOF
               push @dumper,
  -              qq{modperl_trace(NULL, " $name %s\\n", \\
  +              qq{modperl_trace(NULL, " $name %s", \\
                            ($flags(p) & $x) ? "On " : "Off");};
   
               $i += $i || 1;
  @@ -437,7 +437,7 @@
           shift @dumper; #NONE
           print $h_fh join ' \\'."\n", 
             "#define ${class}_dump_flags(p, str)",
  -                     qq{modperl_trace(NULL, "$class flags dump (%s):\\n", str);},
  +                     qq{modperl_trace(NULL, "$class flags dump (%s):", str);},
                        @dumper;
       }
   
  @@ -509,13 +509,13 @@
   #endif
   EOF
           push @dumper,
  -          qq{modperl_trace(NULL, " $type %s ($trace{$type})\\n", ($tl & $i) ? "On " 
: "Off");};
  +          qq{modperl_trace(NULL, " $type %s ($trace{$type})", ($tl & $i) ? "On " : 
"Off");};
           $i += $i;
       }
   
       print $h_fh join ' \\'."\n", 
                        '#define MP_TRACE_dump_flags()',
  -                     qq{modperl_trace(NULL, "mod_perl trace flags dump:\\n");},
  +                     qq{modperl_trace(NULL, "mod_perl trace flags dump:");},
                        @dumper;
   
       ();