cvs commit: apache-2.0/src/main util_filter.c

[rb...@locus.apache.org]

rbb         00/08/04 21:38:58

  Modified:    src/include util_filter.h
               src/main util_filter.c
  Log:
  Fix a small name mix-up.  Filters are part of Apache, and should have the
  ap_ prefix, not apr_
  
  Revision  Changes    Path
  1.3       +10 -10    apache-2.0/src/include/util_filter.h
  
  Index: util_filter.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/util_filter.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- util_filter.h	2000/08/02 05:25:31	1.2
  +++ util_filter.h	2000/08/05 04:38:57	1.3
  @@ -92,10 +92,10 @@
    */
   
   /* forward declare the filter type */
  -typedef struct apr_filter_t apr_filter_t;
  +typedef struct ap_filter_t ap_filter_t;
   
   /*
  - * apr_filter_func:
  + * ap_filter_func:
    *
    * This function type is used for filter callbacks. It will be passed a
    * pointer to "this" filter, and a "bucket" containing the content to be
  @@ -114,7 +114,7 @@
    * next/prev to insert/remove/replace elements in the bucket list, but
    * the types and values of the individual buckets should not be altered.
    */
  -typedef apr_status_t (*apr_filter_func)();
  +typedef apr_status_t (*ap_filter_func)();
   
   /*
    * ap_filter_type:
  @@ -146,7 +146,7 @@
   } ap_filter_type;
   
   /*
  - * apr_filter_t:
  + * ap_filter_t:
    *
    * This is the request-time context structure for an installed filter (in
    * the output filter chain). It provides the callback to use for filtering,
  @@ -159,13 +159,13 @@
    * the state directly with the request. A callback should not change any of
    * the other fields.
    */
  -struct apr_filter_t {
  -    apr_filter_func filter_func;
  +struct ap_filter_t {
  +    ap_filter_func filter_func;
   
       void *ctx;
   
       ap_filter_type ftype;
  -    apr_filter_t *next;
  +    ap_filter_t *next;
   };
   
   /*
  @@ -178,7 +178,7 @@
    * The filter's callback and type should be passed.
    */
   API_EXPORT(void) ap_register_filter(const char *name,
  -                                    apr_filter_func filter_func,
  +                                    ap_filter_func filter_func,
                                       ap_filter_type ftype);
   
   /*
  @@ -198,9 +198,9 @@
   
   /*
    * Things to do later:
  - * Add parameters to apr_filter_func type.  Those parameters will be something
  + * Add parameters to ap_filter_func type.  Those parameters will be something
    *     like:
  - *         (request_rec *r, apr_filter_t *filter, ap_data_list *the_data)
  + *         (request_rec *r, ap_filter_t *filter, ap_data_list *the_data)
    *      obviously, the request_rec is the current request, and the filter
    *      is the current filter stack.  The data_list is a bucket list or
    *      bucket_brigade, but I am trying to keep this patch neutral.  (If this
  
  
  
  1.3       +4 -4      apache-2.0/src/main/util_filter.c
  
  Index: util_filter.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/util_filter.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- util_filter.c	2000/08/02 05:26:49	1.2
  +++ util_filter.c	2000/08/05 04:38:58	1.3
  @@ -66,7 +66,7 @@
    */
   typedef struct ap_filter_rec_t {
       const char *name;
  -    apr_filter_func filter_func;
  +    ap_filter_func filter_func;
       ap_filter_type ftype;
   
       struct ap_filter_rec_t *next;
  @@ -100,7 +100,7 @@
   }
   
   API_EXPORT(void) ap_register_filter(const char *name,
  -                                    apr_filter_func filter_func,
  +                                    ap_filter_func filter_func,
                                       ap_filter_type ftype)
   {
       ap_filter_rec_t *frec = apr_palloc(FILTER_POOL, sizeof(*frec));
  @@ -121,7 +121,7 @@
   
       for (; frec != NULL; frec = frec->next) {
           if (!strcasecmp(name, frec->name)) {
  -            apr_filter_t *f = apr_pcalloc(r->pool, sizeof(*f));
  +            ap_filter_t *f = apr_pcalloc(r->pool, sizeof(*f));
   
               f->filter_func = frec->filter_func;
               f->ctx = ctx;
  @@ -132,7 +132,7 @@
                   r->filters = f;
               }
               else {
  -                apr_filter_t *fscan = r->filters;
  +                ap_filter_t *fscan = r->filters;
                   while (!INSERT_BEFORE(f, fscan->next))
                       fscan = fscan->next;
                   f->next = fscan->next;