cvs commit: apr/helpers default.pl scandoc

[be...@apache.org]

ben         01/01/29 14:29:26

  Modified:    include  http_config.h http_request.h
               helpers  default.pl scandoc
  Log:
  More doc improvements.
  
  Revision  Changes    Path
  1.62      +1 -1      httpd-2.0/include/http_config.h
  
  Index: http_config.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/http_config.h,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- http_config.h	2001/01/27 17:50:44	1.61
  +++ http_config.h	2001/01/29 22:29:22	1.62
  @@ -996,8 +996,8 @@
   /**
    * Run the handler functions for each module
    * @param r The request_rec
  - * @deffunc void ap_run_handler(request_rec *r)
    * @tip non-wildcard handlers should HOOK_MIDDLE, wildcard HOOK_LAST
  + * @deffunc void ap_run_handler(request_rec *r)
    */
   AP_DECLARE_HOOK(int,handler,(request_rec *))
   
  
  
  
  1.22      +1 -1      httpd-2.0/include/http_request.h
  
  Index: http_request.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/http_request.h,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- http_request.h	2001/01/19 07:04:13	1.21
  +++ http_request.h	2001/01/29 22:29:23	1.22
  @@ -137,7 +137,7 @@
    * has to be inserted at the end of a sub-requests filter stack.
    * @param f The current filter
    * @param bb The brigade to filter
  - * @deffuc apr_status_t ap_sub_req_output_filter(ap_filter_t *f, apr_bucket_brigade *bb)
  + * @deffunc apr_status_t ap_sub_req_output_filter(ap_filter_t *f, apr_bucket_brigade *bb)
    */
   AP_CORE_DECLARE_NONSTD(apr_status_t) ap_sub_req_output_filter(ap_filter_t *f,
                                                           apr_bucket_brigade *bb);
  
  
  
  1.7       +5 -1      apr/helpers/default.pl
  
  Index: default.pl
  ===================================================================
  RCS file: /home/cvs/apr/helpers/default.pl,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- default.pl	2000/11/18 03:42:25	1.6
  +++ default.pl	2001/01/29 22:29:25	1.7
  @@ -498,7 +498,11 @@
   
   sub processDescription {
     local ($_) = @_;
  -  
  +
  +  # handle HTML markup issues.
  +  s/</&lt;/g;
  +  s/>/&gt;/g;
  +
     s/^\s+//;				# Remove whitespace from beginning
     s/\s+$/\n/;				# Remove whitespace from end
     s/\n\n/<p>\n/g;			# Replace multiple CR's with paragraph markers
  
  
  
  1.4       +8 -1      apr/helpers/scandoc
  
  Index: scandoc
  ===================================================================
  RCS file: /home/cvs/apr/helpers/scandoc,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- scandoc	2000/07/29 16:24:11	1.3
  +++ scandoc	2001/01/29 22:29:25	1.4
  @@ -129,6 +129,8 @@
         if ($debug) { print STDERR "(0:$srcfile) $linenumber.\n"; } 
       }
     }
  +  # Dispose of Apache specific macros
  +  removeApacheMacros();
   }
   
   # Don't skip "#"
  @@ -642,7 +644,7 @@
   
       # Eliminate in-line comments
       &removeComment;
  -    
  +
       # Check for multi-line declaration
       while ((($valid, $d) = &matchDecl) && $valid) { $decl .= $d; }
       
  @@ -1076,6 +1078,11 @@
       }
     }
     return @r;
  +}
  +
  +sub removeApacheMacros {
  +#    print "removing from $_";
  +    s|AP_DECLARE\((.*?)\)|$1|;
   }
   
   # Class for parsed package