Mercurial > hg > waaad
changeset 319:25d722e650d4
Other similar workarounds to avoid name collision between main daemon and extensions (link with cmake seems buggy...)
| author | Sebastien Decugis <sdecugis@nict.go.jp> |
|---|---|
| date | Mon, 02 Mar 2009 12:07:38 +0900 |
| parents | 088ef7db9e52 |
| children | cfa8c1f4c07a |
| files | extensions/rt_default/rt_default.h extensions/sec_nosec/sec_nosec.c extensions/sec_nosec/sec_nosec.h extensions/sec_nosec/sns_conf.y |
| diffstat | 4 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/extensions/rt_default/rt_default.h Mon Mar 02 11:55:07 2009 +0900 +++ b/extensions/rt_default/rt_default.h Mon Mar 02 12:07:38 2009 +0900 @@ -74,7 +74,7 @@ /* Parse the configuration file */ -int conf_parse(char * conffile); +int rtd_conf_handle(char * conffile); /* Initialize the peer table */
--- a/extensions/sec_nosec/sec_nosec.c Mon Mar 02 11:55:07 2009 +0900 +++ b/extensions/sec_nosec/sec_nosec.c Mon Mar 02 12:07:38 2009 +0900 @@ -48,7 +48,7 @@ static sec_module_t sns_mod; static sec_mod_hdl_t * sns_hdl; -int verbosity; +int sns_verbosity; /* The main entry point of the extension, called when the extension is loaded, after API initialization */ static int sec_nosec_main(char * conffile) @@ -57,7 +57,7 @@ TRACE_ENTRY("%p", conffile); - verbosity = 0; + sns_verbosity = 0; /* The configuration file is mandatory */ if (!conffile) {
--- a/extensions/sec_nosec/sec_nosec.h Mon Mar 02 11:55:07 2009 +0900 +++ b/extensions/sec_nosec/sec_nosec.h Mon Mar 02 12:07:38 2009 +0900 @@ -105,9 +105,9 @@ #define TRACE_LEVEL INFO #endif /* TRACE_LEVEL */ static int debug_level = TRACE_LEVEL; -extern int verbosity; +extern int sns_verbosity; #define TRACE_DEBUG(level,format,args... ) \ - { if ( level <= debug_level + verbosity ) \ + { if ( level <= debug_level + sns_verbosity ) \ log_debug("%-12s:%-4d( %-15s): " format "\n", __FILE__, __LINE__, __FUNCTION__, ## args); } #define TRACE_ENTRY(_format,_args... ) \ TRACE_DEBUG(FULL, "Entering ext function (parms: " _format ")", ##_args )