apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apr-util/src/hooks Makefile.in ap_hooks.c
Date Tue, 05 Dec 2000 02:19:38 GMT
rbb         00/12/04 18:19:38

  Modified:    include  ap_hooks.h
               src/hooks Makefile.in ap_hooks.c
  Log:
  Get the hooks code into apr-utils
  
  Revision  Changes    Path
  1.25      +10 -12    apr-util/include/ap_hooks.h
  
  Index: ap_hooks.h
  ===================================================================
  RCS file: /home/cvs/apr-util/include/ap_hooks.h,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- ap_hooks.h	2000/11/26 04:47:27	1.24
  +++ ap_hooks.h	2000/12/05 02:19:38	1.25
  @@ -55,8 +55,6 @@
   #ifndef APACHE_AP_HOOKS_H
   #define APACHE_AP_HOOKS_H
   
  -#include "ap_config.h"
  -
   /* For apr_array_header_t */
   #include "apr_tables.h"
   
  @@ -64,7 +62,7 @@
    * @package Apache hooks functions
    */
   
  -#define AP_DECLARE_EXTERNAL_HOOK(link,ret,name,args) \
  +#define APR_DECLARE_EXTERNAL_HOOK(link,ret,name,args) \
   typedef ret HOOK_##name args; \
   link##_DECLARE(void) ap_hook_##name(HOOK_##name *pf, const char* const* aszPre, \
                                       const char * const *aszSucc, int nOrder); \
  @@ -78,8 +76,8 @@
       int nOrder; \
       } LINK_##name;
   
  -#define AP_DECLARE_HOOK(ret,name,args) \
  -AP_DECLARE_EXTERNAL_HOOK(AP,ret,name,args)
  +#define APR_DECLARE_HOOK(ret,name,args) \
  +APR_DECLARE_EXTERNAL_HOOK(AP,ret,name,args)
   
   #define AP_HOOK_STRUCT(members) \
   static struct { members } _hooks;
  @@ -197,20 +195,20 @@
    * The global pool used to allocate any memory needed by the hooks.
    * @defvar apr_pool_t *ap_global_hook_pool
    */ 
  -extern AP_DECLARE_DATA apr_pool_t *ap_global_hook_pool;
  +extern APR_DECLARE_DATA apr_pool_t *ap_global_hook_pool;
   
   /**
    * A global variable to determine if debugging information about the
    * hooks functions should be printed
    * @defvar apr_pool_t *ap_debug_module_hooks
    */ 
  -extern AP_DECLARE_DATA int ap_debug_module_hooks;
  +extern APR_DECLARE_DATA int ap_debug_module_hooks;
   
   /**
    * The name of the module that is currently registering a function
    * @defvar apr_pool_t *ap_debug_module_name
    */ 
  -extern AP_DECLARE_DATA const char *ap_debug_module_name;
  +extern APR_DECLARE_DATA const char *ap_debug_module_name;
   
   /**
    * Register a hook function to be sorted
  @@ -218,13 +216,13 @@
    * @param aHooks The array which stores all of the functions for this hook
    * @deffunc void ap_hook_sort_register(const char *szHookName, ap_arry_header_t **aHooks)
    */
  -AP_DECLARE(void) ap_hook_sort_register(const char *szHookName, 
  +APR_DECLARE(void) ap_hook_sort_register(const char *szHookName, 
                                          apr_array_header_t **aHooks);
   /**
    * Sort all of the registerd functions for a given hook
    * @deffunc void ap_sort_hooks(void)
    */
  -AP_DECLARE(void) ap_sort_hooks(void);
  +APR_DECLARE(void) ap_sort_hooks(void);
   
   /**
    * Print all of the information about the current hook.  This is used for
  @@ -234,13 +232,13 @@
    * @param aszSucc All of the functions in the successor array
    * @deffunc void ap_show_hook(const char *szName, const char *const *aszPre, const char
*const *aszSucc)
    */
  -AP_DECLARE(void) ap_show_hook(const char *szName,const char * const *aszPre,
  +APR_DECLARE(void) ap_show_hook(const char *szName,const char * const *aszPre,
                                 const char * const *aszSucc);
   
   /**
    * Remove all currently registered functions.
    * @deffunc void ap_hook_deregister_all(void)
    */
  -AP_DECLARE(void) ap_hook_deregister_all(void);
  +APR_DECLARE(void) ap_hook_deregister_all(void);
   
   #endif /* ndef(AP_HOOKS_H) */
  
  
  
  1.2       +2 -0      apr-util/src/hooks/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/src/hooks/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.in	2000/12/02 16:13:49	1.1
  +++ Makefile.in	2000/12/05 02:19:38	1.2
  @@ -1,3 +1,5 @@
   
  +TARGETS = ap_hooks.lo
  +
   top_builddir = @top_builddir@
   include $(top_builddir)/build/rules.mk
  
  
  
  1.22      +9 -9      apr-util/src/hooks/ap_hooks.c
  
  Index: ap_hooks.c
  ===================================================================
  RCS file: /home/cvs/apr-util/src/hooks/ap_hooks.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- ap_hooks.c	2000/11/26 04:47:28	1.21
  +++ ap_hooks.c	2000/12/05 02:19:38	1.22
  @@ -57,17 +57,17 @@
   
   #include "apr_pools.h"
   #include "apr_tables.h"
  -
  -#include "ap_config.h"
  +#include "apr.h"
   #include "ap_hooks.h"
   
  +
   #if 0
   #define apr_palloc(pool,size)	malloc(size)
   #endif
   
  -AP_DECLARE_DATA apr_pool_t *ap_global_hook_pool = NULL;
  -AP_DECLARE_DATA int ap_debug_module_hooks = 0;
  -AP_DECLARE_DATA const char *ap_debug_module_name = NULL;
  +APR_DECLARE_DATA apr_pool_t *ap_global_hook_pool = NULL;
  +APR_DECLARE_DATA int ap_debug_module_hooks = 0;
  +APR_DECLARE_DATA const char *ap_debug_module_name = NULL;
   
   /* NB: This must echo the LINK_##name structure */
   typedef struct
  @@ -207,7 +207,7 @@
       apr_array_header_t **paHooks;
   } HookSortEntry;
   
  -AP_DECLARE(void) ap_hook_sort_register(const char *szHookName,
  +APR_DECLARE(void) ap_hook_sort_register(const char *szHookName,
                                         apr_array_header_t **paHooks)
   {
       HookSortEntry *pEntry;
  @@ -219,7 +219,7 @@
       pEntry->paHooks=paHooks;
   }
   
  -AP_DECLARE(void) ap_sort_hooks()
  +APR_DECLARE(void) ap_sort_hooks()
   {
       int n;
   
  @@ -229,7 +229,7 @@
       }
   }
       
  -AP_DECLARE(void) ap_hook_deregister_all(void)
  +APR_DECLARE(void) ap_hook_deregister_all(void)
   {
       int n;    
   
  @@ -240,7 +240,7 @@
       s_aHooksToSort=NULL;
   }
   
  -AP_DECLARE(void) ap_show_hook(const char *szName,const char * const *aszPre,
  +APR_DECLARE(void) ap_show_hook(const char *szName,const char * const *aszPre,
   		             const char * const *aszSucc)
   {
       int nFirst;
  
  
  

Mime
View raw message