httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/modules/filters mod_include.h mod_include.c
Date Tue, 10 Apr 2001 16:57:28 GMT
wrowe       01/04/10 09:57:28

  Modified:    modules/filters mod_include.h mod_include.c
  Log:
    change include_handler to include_handler_fn_t, and clean up a nasty
    explicit cast that could float from the include_handler_fn_t declaration.
  
  Revision  Changes    Path
  1.17      +3 -3      httpd-2.0/modules/filters/mod_include.h
  
  Index: mod_include.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/filters/mod_include.h,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- mod_include.h	2001/04/10 16:26:21	1.16
  +++ mod_include.h	2001/04/10 16:57:27	1.17
  @@ -195,7 +195,7 @@
   }
   
   
  -typedef int (include_handler)(include_ctx_t *ctx, apr_bucket_brigade **bb, 
  +typedef int (include_handler_fn_t)(include_ctx_t *ctx, apr_bucket_brigade **bb,
                          request_rec *r, ap_filter_t *f, apr_bucket *head_ptr, 
                          apr_bucket **inserted_head);
   
  @@ -208,7 +208,7 @@
                                                       char *out,
                                                       size_t length,
                                                       int leave_name));
  -APR_DECLARE_OPTIONAL_FN(void, ap_register_include_handler, (char *tag,
  -                                                         include_handler *func));
  +APR_DECLARE_OPTIONAL_FN(void, ap_register_include_handler, 
  +                        (char *tag, include_handler_fn_t *func));
   
   #endif /* MOD_INCLUDE */
  
  
  
  1.107     +4 -4      httpd-2.0/modules/filters/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/filters/mod_include.c,v
  retrieving revision 1.106
  retrieving revision 1.107
  diff -u -r1.106 -r1.107
  --- mod_include.c	2001/04/10 16:26:21	1.106
  +++ mod_include.c	2001/04/10 16:57:27	1.107
  @@ -2515,9 +2515,9 @@
               ctx->curr_tag_pos = &ctx->combined_tag[ctx->directive_length+1];
   
               handle_func = 
  -                (int (*)(include_ctx_t *, apr_bucket_brigade **, request_rec *,
  -                    ap_filter_t *, apr_bucket *, apr_bucket **))
  -                apr_hash_get(include_hash, ctx->combined_tag, ctx->directive_length+1);
  +                (include_handler_fn_t *)apr_hash_get(include_hash, 
  +                                                     ctx->combined_tag, 
  +                                                     ctx->directive_length+1);
               if (handle_func != NULL) {
                   ret = (*handle_func)(ctx, bb, r, f, dptr, &content_head);
               }
  @@ -2790,7 +2790,7 @@
       return OK;
   }
   
  -static void ap_register_include_handler(char *tag, include_handler *func)
  +static void ap_register_include_handler(char *tag, include_handler_fn_t *func)
   {
       apr_hash_set(include_hash, tag, strlen(tag) + 1, (const void *)func);
   }
  
  
  

Mime
View raw message