Module: sip-router Branch: master Commit: 81fad30ac1b1e0674442e1651d20dd7ffceac19e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=81fad30… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jul 29 10:41:25 2009 +0200 modules_k: destroy() functions set to static - fix namespacing conflicts in darwinos --- modules_k/htable/htable.c | 4 ++-- modules_k/imc/imc.c | 4 ++-- modules_k/jabber/jabber.c | 4 ++-- modules_k/kex/kex_mod.c | 4 ++-- modules_k/mi_xmlrpc/mi_xmlrpc.c | 2 +- modules_k/msilo/msilo.c | 4 ++-- modules_k/ratelimit/ratelimit.c | 4 ++-- modules_k/rls/rls.c | 4 ++-- modules_k/sqlops/sqlops.c | 4 ++-- modules_k/tmx/tmx_mod.c | 4 ++-- modules_k/xcap_client/xcap_client.c | 4 ++-- modules_k/xlog/xlog.c | 4 ++-- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/modules_k/htable/htable.c b/modules_k/htable/htable.c index 41a9a2c..6291c2b 100644 --- a/modules_k/htable/htable.c +++ b/modules_k/htable/htable.c @@ -50,7 +50,7 @@ int ht_timer_interval = 20; static int ht_print(struct sip_msg*, char*, char*); static int mod_init(void); static int child_init(int rank); -void destroy(void); +static void destroy(void); static int fixup_ht_rm(void** param, int param_no); static int ht_rm_name_re(struct sip_msg* msg, char* key, char* foo); @@ -200,7 +200,7 @@ static int child_init(int rank) /** * destroy function */ -void destroy(void) +static void destroy(void) { ht_destroy(); } diff --git a/modules_k/imc/imc.c b/modules_k/imc/imc.c index dd042de..3b3b5b5 100644 --- a/modules_k/imc/imc.c +++ b/modules_k/imc/imc.c @@ -88,7 +88,7 @@ static int imc_manager(struct sip_msg*, char *, char *); static struct mi_root* imc_mi_list_rooms(struct mi_root* cmd, void* param); static struct mi_root* imc_mi_list_members(struct mi_root* cmd, void* param); -void destroy(void); +static void destroy(void); /** TM bind */ struct tm_binds tmb; @@ -608,7 +608,7 @@ error: /** * destroy module */ -void destroy(void) +static void destroy(void) { imc_room_p irp = NULL; imc_member_p member = NULL; diff --git a/modules_k/jabber/jabber.c b/modules_k/jabber/jabber.c index 2c5b8d3..f8c4bfb 100644 --- a/modules_k/jabber/jabber.c +++ b/modules_k/jabber/jabber.c @@ -129,7 +129,7 @@ static int xj_exit_jconf(struct sip_msg*, char*, char*); static int xj_go_online(struct sip_msg*, char*, char*); static int xj_go_offline(struct sip_msg*, char*, char*); -void destroy(void); +static void destroy(void); /* * Exported functions @@ -657,7 +657,7 @@ error: /** * destroy function of module */ -void destroy(void) +static void destroy(void) { int i; #ifdef XJ_EXTRA_DEBUG diff --git a/modules_k/kex/kex_mod.c b/modules_k/kex/kex_mod.c index 7fa5830..d481d77 100644 --- a/modules_k/kex/kex_mod.c +++ b/modules_k/kex/kex_mod.c @@ -43,7 +43,7 @@ MODULE_VERSION /** module functions */ static int mod_init(void); -void destroy(void); +static void destroy(void); static cmd_export_t cmds[]={ {"setsflag", (cmd_function)w_setsflag, 1,fixup_igp_null, @@ -120,7 +120,7 @@ static int mod_init(void) /** * destroy function */ -void destroy(void) +static void destroy(void) { #ifdef STATISTICS destroy_stats_collector(); diff --git a/modules_k/mi_xmlrpc/mi_xmlrpc.c b/modules_k/mi_xmlrpc/mi_xmlrpc.c index d29cf04..6d9bf51 100644 --- a/modules_k/mi_xmlrpc/mi_xmlrpc.c +++ b/modules_k/mi_xmlrpc/mi_xmlrpc.c @@ -263,7 +263,7 @@ error: } -void destroy(void) +static void destroy(void) { destroy_async_lock(); } diff --git a/modules_k/msilo/msilo.c b/modules_k/msilo/msilo.c index e4a5024..58f31a1 100644 --- a/modules_k/msilo/msilo.c +++ b/modules_k/msilo/msilo.c @@ -159,7 +159,7 @@ static int child_init(int); static int m_store(struct sip_msg*, char*, char*); static int m_dump(struct sip_msg*, char*, char*); -void destroy(void); +static void destroy(void); void m_clean_silo(unsigned int ticks, void *); void m_send_ontimer(unsigned int ticks, void *); @@ -1159,7 +1159,7 @@ void m_clean_silo(unsigned int ticks, void *param) /** * destroy function */ -void destroy(void) +static void destroy(void) { msg_list_free(ml); diff --git a/modules_k/ratelimit/ratelimit.c b/modules_k/ratelimit/ratelimit.c index f3f5025..806ecab 100644 --- a/modules_k/ratelimit/ratelimit.c +++ b/modules_k/ratelimit/ratelimit.c @@ -215,7 +215,7 @@ static int add_pipe_params(modparam_t, void *); /* RESERVED for future use static int set_load_source(modparam_t, void *); */ -void destroy(void); +static void destroy(void); static cmd_export_t cmds[]={ {"rl_check", (cmd_function)w_rl_check_default, 0, 0, 0, REQUEST_ROUTE|LOCAL_ROUTE}, @@ -593,7 +593,7 @@ static int mod_init(void) } -void destroy(void) +static void destroy(void) { int i; diff --git a/modules_k/rls/rls.c b/modules_k/rls/rls.c index fd9f5da..0ec96fc 100644 --- a/modules_k/rls/rls.c +++ b/modules_k/rls/rls.c @@ -153,7 +153,7 @@ str str_doc_col = str_init("doc"); static int mod_init(void); static int child_init(int); int rls_handle_subscribe(struct sip_msg*, char*, char*); -void destroy(void); +static void destroy(void); int rlsubs_table_restore(); void rlsubs_table_update(unsigned int ticks,void *param); int add_rls_event(modparam_t type, void* val); @@ -492,7 +492,7 @@ static int child_init(int rank) /* * destroy function */ -void destroy(void) +static void destroy(void) { LM_DBG("start\n"); diff --git a/modules_k/sqlops/sqlops.c b/modules_k/sqlops/sqlops.c index b38bbe3..cbaea89 100644 --- a/modules_k/sqlops/sqlops.c +++ b/modules_k/sqlops/sqlops.c @@ -42,7 +42,7 @@ MODULE_VERSION static int sql_query(struct sip_msg*, char*, char*, char*); static int sql_rfree(struct sip_msg*, char*, char*); static int child_init(int rank); -void destroy(void); +static void destroy(void); static int fixup_sql_query(void** param, int param_no); static int fixup_sql_rfree(void** param, int param_no); @@ -97,7 +97,7 @@ static int child_init(int rank) /** * destroy function */ -void destroy(void) +static void destroy(void) { sql_destroy(); } diff --git a/modules_k/tmx/tmx_mod.c b/modules_k/tmx/tmx_mod.c index ce2e61d..4a51e7f 100644 --- a/modules_k/tmx/tmx_mod.c +++ b/modules_k/tmx/tmx_mod.c @@ -42,7 +42,7 @@ struct tm_binds _tmx_tmb; /** module functions */ static int mod_init(void); -void destroy(void); +static void destroy(void); static int t_cancel_branches(struct sip_msg* msg, char *k, char *s2); static int fixup_cancel_branches(void** param, int param_no); @@ -184,7 +184,7 @@ static int mod_init(void) /** * destroy function */ -void destroy(void) +static void destroy(void) { return; } diff --git a/modules_k/xcap_client/xcap_client.c b/modules_k/xcap_client/xcap_client.c index 8be0798..6d196ff 100644 --- a/modules_k/xcap_client/xcap_client.c +++ b/modules_k/xcap_client/xcap_client.c @@ -54,7 +54,7 @@ MODULE_VERSION static int mod_init(void); static int child_init(int rank); -void destroy(void); +static void destroy(void); struct mi_root* refreshXcapDoc(struct mi_root* cmd, void* param); int get_auid_flag(str auid); str xcap_db_table = str_init("xcap"); @@ -180,7 +180,7 @@ static int child_init(int rank) return 0; } -void destroy(void) +static void destroy(void) { curl_global_cleanup(); if(xcap_db != NULL) diff --git a/modules_k/xlog/xlog.c b/modules_k/xlog/xlog.c index 07bb378..c614105 100644 --- a/modules_k/xlog/xlog.c +++ b/modules_k/xlog/xlog.c @@ -59,7 +59,7 @@ static int xdbg(struct sip_msg*, char*, char*); static int xlog_fixup(void** param, int param_no); static int xdbg_fixup(void** param, int param_no); -void destroy(void); +static void destroy(void); int pv_parse_color_name(pv_spec_p sp, str *in); static int pv_get_color(struct sip_msg *msg, pv_param_t *param, @@ -216,7 +216,7 @@ static int xdbg(struct sip_msg* msg, char* frm, char* str2) /** * destroy function */ -void destroy(void) +static void destroy(void) { if(_xlog_buf) pkg_free(_xlog_buf);