httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: httpd-2.0/include util_filter.h
Date Sat, 08 Jun 2002 03:05:06 GMT
jerenkrantz    2002/06/07 20:05:06

  Modified:    include  util_filter.h
  Log:
  Style cleanups before contemplating adding init filter hook.
  (No functional changes)
  
  Revision  Changes    Path
  1.72      +23 -16    httpd-2.0/include/util_filter.h
  
  Index: util_filter.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/util_filter.h,v
  retrieving revision 1.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- util_filter.h	13 Mar 2002 20:47:42 -0000	1.71
  +++ util_filter.h	8 Jun 2002 03:05:06 -0000	1.72
  @@ -163,9 +163,13 @@
    * @ingroup filter
    * @{
    */
  -typedef apr_status_t (*ap_out_filter_func)(ap_filter_t *f, apr_bucket_brigade *b);
  -typedef apr_status_t (*ap_in_filter_func)(ap_filter_t *f, apr_bucket_brigade *b, 
  -                                          ap_input_mode_t mode, apr_read_type_e block,
apr_off_t readbytes);
  +typedef apr_status_t (*ap_out_filter_func)(ap_filter_t *f,
  +                                           apr_bucket_brigade *b);
  +typedef apr_status_t (*ap_in_filter_func)(ap_filter_t *f,
  +                                          apr_bucket_brigade *b, 
  +                                          ap_input_mode_t mode,
  +                                          apr_read_type_e block,
  +                                          apr_off_t readbytes);
   
   typedef union ap_filter_func {
       ap_out_filter_func out_func;
  @@ -303,7 +307,8 @@
    * @param filter The next filter in the chain
    * @param bucket The current bucket brigade
    */
  -AP_DECLARE(apr_status_t) ap_pass_brigade(ap_filter_t *filter, apr_bucket_brigade *bucket);
  +AP_DECLARE(apr_status_t) ap_pass_brigade(ap_filter_t *filter,
  +                                         apr_bucket_brigade *bucket);
   
   /**
    * This function is used to register an input filter with the system. 
  @@ -318,8 +323,8 @@
    * @see add_input_filter()
    */
   AP_DECLARE(ap_filter_rec_t *) ap_register_input_filter(const char *name,
  -					  ap_in_filter_func filter_func,
  -					  ap_filter_type ftype);
  +                                          ap_in_filter_func filter_func,
  +                                          ap_filter_type ftype);
   /**
    * This function is used to register an output filter with the system. 
    * After this registration is performed, then a filter may be added 
  @@ -333,8 +338,8 @@
    * @see ap_add_output_filter()
    */
   AP_DECLARE(ap_filter_rec_t *) ap_register_output_filter(const char *name,
  -					    ap_out_filter_func filter_func,
  -					    ap_filter_type ftype);
  +                                            ap_out_filter_func filter_func,
  +                                            ap_filter_type ftype);
   
   /**
    * Adds a named filter into the filter chain on the specified request record.
  @@ -355,7 +360,7 @@
    * @param c The connection to add the fillter for
    */
   AP_DECLARE(ap_filter_t *) ap_add_input_filter(const char *name, void *ctx,
  -					      request_rec *r, conn_rec *c);
  +                                              request_rec *r, conn_rec *c);
   
   /**
    * Variant of ap_add_input_filter() that accepts a registered filter handle
  @@ -387,7 +392,7 @@
    * @param c The connection to add this filter for
    */
   AP_DECLARE(ap_filter_t *) ap_add_output_filter(const char *name, void *ctx, 
  -					       request_rec *r, conn_rec *c);
  +                                               request_rec *r, conn_rec *c);
   
   /**
    * Variant of ap_add_output_filter() that accepts a registered filter handle
  @@ -447,7 +452,8 @@
    *          on return
    * @param p Ensure that all data in the brigade lives as long as this pool
    */
  -AP_DECLARE(apr_status_t) ap_save_brigade(ap_filter_t *f, apr_bucket_brigade **save_to,
  +AP_DECLARE(apr_status_t) ap_save_brigade(ap_filter_t *f,
  +                                         apr_bucket_brigade **save_to,
                                            apr_bucket_brigade **b, apr_pool_t *p);    
   
   /**
  @@ -456,7 +462,8 @@
    * @param bb The brigade to flush
    * @param ctx The filter to pass the brigade to
    */
  -AP_DECLARE_NONSTD(apr_status_t) ap_filter_flush(apr_bucket_brigade *bb, void *ctx);
  +AP_DECLARE_NONSTD(apr_status_t) ap_filter_flush(apr_bucket_brigade *bb,
  +                                                void *ctx);
   
   /**
    * Flush the current brigade down the filter stack.
  @@ -473,7 +480,7 @@
    * @param nbyte The number of bytes in the data
    */
   #define ap_fwrite(f, bb, data, nbyte) \
  -	apr_brigade_write(bb, ap_filter_flush, f, data, nbyte)
  +        apr_brigade_write(bb, ap_filter_flush, f, data, nbyte)
   
   /**
    * Write a buffer for the current filter, buffering if possible.
  @@ -482,7 +489,7 @@
    * @param str The string to write
    */
   #define ap_fputs(f, bb, str) \
  -	apr_brigade_puts(bb, ap_filter_flush, f, str)
  +        apr_brigade_puts(bb, ap_filter_flush, f, str)
   
   /**
    * Write a character for the current filter, buffering if possible.
  @@ -491,7 +498,7 @@
    * @param c The character to write
    */
   #define ap_fputc(f, bb, c) \
  -	apr_brigade_putc(bb, ap_filter_flush, f, c)
  +        apr_brigade_putc(bb, ap_filter_flush, f, c)
   
   /**
    * Write an unspecified number of strings to the current filter
  @@ -520,4 +527,4 @@
   }
   #endif
   
  -#endif	/* !AP_FILTER_H */
  +#endif  /* !AP_FILTER_H */
  
  
  

Mime
View raw message