Browse code

- further logging output cleanup in mod_init, mod_destroy: dispatcher, mi_xmlrpc, presence_dialoginfo, presence_mwi, pua, pua_bla, pua_dialoginfo, pua_mi, pua_usrloc - remove now empty mod_init, mod_destroy functions in: presence_dialoginfo, presence_mwi, pua_bla, pua_dialoginfo, pua_mi, pua_usrloc - smaller whitespace and alignment changes in module exports, remove response_function cast from NULL pointer, we don't do this for all other function exports, so it make no sense to handle this one special

git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4949 689a6050-402a-0410-94f2-e92a70836424

Henning Westerholt authored on 18/09/2008 12:02:39
Showing 30 changed files
... ...
@@ -155,8 +155,8 @@ struct module_exports exports = {
155 155
 	0,          /* exported pseudo-variables */
156 156
 	0,          /* extra processes */
157 157
 	avpops_init,/* Module initialization function */
158
-	(response_function) 0,
159
-	(destroy_function) 0,
158
+	0,
159
+	0,
160 160
 	(child_init_function) avpops_child_init /* per-child init function */
161 161
 };
162 162
 
... ...
@@ -182,7 +182,7 @@ struct module_exports exports = {
182 182
 	0,        /* exported pseudo-variables */
183 183
 	cpl_procs,/* extra processes */
184 184
 	cpl_init, /* Module initialization function */
185
-	(response_function) 0,
185
+	0,
186 186
 	(destroy_function) cpl_exit,
187 187
 	(child_init_function) cpl_child_init /* per-child init function */
188 188
 };
... ...
@@ -187,7 +187,7 @@ struct module_exports exports= {
187 187
 	0,          /* exported pseudo-variables */
188 188
 	0,          /* extra processes */
189 189
 	mod_init,   /* module initialization function */
190
-	(response_function) 0,
190
+	0,
191 191
 	(destroy_function) destroy,
192 192
 	child_init  /* per-child init function */
193 193
 };
... ...
@@ -353,9 +353,6 @@ static int mod_init(void)
353 353
  */
354 354
 static int child_init(int rank)
355 355
 {
356
-	
357
-	LM_DBG(" #%d / pid <%d>\n", rank, getpid());
358
-
359 356
 	srand((11+rank)*getpid()*7);
360 357
 
361 358
 	return 0;
... ...
@@ -375,7 +372,6 @@ static int mi_child_init(void)
375 372
  */
376 373
 static void destroy(void)
377 374
 {
378
-	LM_DBG("destroying module ...\n");
379 375
 	ds_destroy_list();
380 376
 	if(ds_db_url.s)
381 377
 		ds_disconnect_db();
... ...
@@ -147,7 +147,7 @@ struct module_exports exports= {
147 147
 	0,          /* exported pseudo-variables */
148 148
 	0,          /* extra processes */
149 149
 	mod_init,   /* mod init */
150
-	(response_function) 0,       /* response handler */
150
+	0,          /* response handler */
151 151
 	(destroy_function) destroy,  /* destroy function */
152 152
 	child_init  /* child init */
153 153
 };
... ...
@@ -187,7 +187,7 @@ struct module_exports exports= {
187 187
 	0,          /* exported pseudo-variables */
188 188
 	0,          /* extra processes */
189 189
 	mod_init,   /* module initialization function */
190
-	(response_function) 0,
190
+	0,
191 191
 	(destroy_function) destroy,
192 192
 	child_init  /* per-child init function */
193 193
 };
... ...
@@ -82,9 +82,9 @@ struct module_exports exports= {
82 82
 	0,          /* exported pseudo-variables */
83 83
 	0,          /* extra processes */
84 84
 	mod_init,
85
-	(response_function) 0,
86
-	(destroy_function) 0,
87
-	0  /* per-child init function */
85
+	0,
86
+	0,
87
+	0           /* per-child init function */
88 88
 };
89 89
 
90 90
 
... ...
@@ -132,7 +132,7 @@ struct module_exports exports = {
132 132
 	0,                             /* exported pseudo-variables */
133 133
 	mi_procs,                      /* extra processes */
134 134
 	mi_mod_init,                   /* module initialization function */
135
-	(response_function) 0,         /* response handling function */
135
+	0,                             /* response handling function */
136 136
 	(destroy_function) mi_destroy, /* destroy function */
137 137
 	mi_child_init                  /* per-child init function */
138 138
 };
... ...
@@ -95,7 +95,7 @@ struct module_exports exports = {
95 95
 	0,                             /* exported pseudo-variables */
96 96
 	mi_procs,                      /* extra processes */
97 97
 	mi_mod_init,                   /* module initialization function */
98
-	(response_function) 0,         /* response handling function */
98
+	0,                             /* response handling function */
99 99
 	(destroy_function) mi_destroy, /* destroy function */
100 100
 	mi_child_init                  /* per-child init function */
101 101
 };
... ...
@@ -109,8 +109,8 @@ struct module_exports exports = {
109 109
 	0,                                  /* exported PV */
110 110
 	mi_procs,                           /* extra processes */
111 111
 	mod_init,                           /* module initialization function */
112
-	(response_function) 0,              /* response handling function */
113
-	(destroy_function) destroy,         /* destroy function */
112
+	0,                                  /* response handling function */
113
+	destroy,                            /* destroy function */
114 114
 	0                                   /* per-child init function */
115 115
 };
116 116
 
... ...
@@ -246,8 +246,6 @@ error:
246 246
 
247 247
 int destroy(void)
248 248
 {
249
-	LM_DBG("destroying module ...\n");
250
-
251 249
 	destroy_async_lock();
252 250
 
253 251
 	return 0;
... ...
@@ -244,7 +244,7 @@ struct module_exports exports= {
244 244
 	0,          /* exported pseudo-variables */
245 245
 	0,          /* extra processes */
246 246
 	mod_init,   /* module initialization function */
247
-	(response_function) 0,       /* response handler */
247
+	0,   	    /* response handler */
248 248
 	(destroy_function) destroy,  /* module destroy function */
249 249
 	child_init  /* per-child init function */
250 250
 };
... ...
@@ -100,7 +100,7 @@ struct module_exports exports= {
100 100
 	0,           /* exported pseudo-variables */
101 101
 	0,           /* extra processes */
102 102
 	pike_init,   /* module initialization function */
103
-	(response_function) 0,
103
+	0,
104 104
 	(destroy_function) pike_exit,   /* module exit function */
105 105
 	0  /* per-child init function */
106 106
 };
... ...
@@ -163,15 +163,15 @@ static mi_export_t mi_cmds[] = {
163 163
 /** module exports */
164 164
 struct module_exports exports= {
165 165
 	"presence",			/* module name */
166
-	DEFAULT_DLFLAGS,		/* dlopen flags */
166
+	DEFAULT_DLFLAGS,	/* dlopen flags */
167 167
 	cmds,				/* exported functions */
168 168
 	params,				/* exported parameters */
169
-	0,				/* exported statistics */
169
+	0,					/* exported statistics */
170 170
 	mi_cmds,   			/* exported MI functions */
171
-	0,				/* exported pseudo-variables */
172
-	0,				/* extra processes */
171
+	0,					/* exported pseudo-variables */
172
+	0,					/* extra processes */
173 173
 	mod_init,			/* module initialization function */
174
-	(response_function) 0,      	/* response handling function */
174
+	0,   				/* response handling function */
175 175
 	(destroy_function) destroy, 	/* destroy function */
176 176
 	child_init                  	/* per-child init function */
177 177
 };
... ...
@@ -45,7 +45,6 @@ MODULE_VERSION
45 45
 
46 46
 /* module functions */
47 47
 static int mod_init(void);
48
-static void destroy(void);
49 48
 
50 49
 /* module variables */
51 50
 add_event_t pres_add_event;
... ...
@@ -74,10 +73,10 @@ struct module_exports exports= {
74 73
     0,							/* exported statistics */
75 74
     0,							/* exported MI functions */
76 75
     0,							/* exported pseudo-variables */
77
-	0,							/* extra processes */
76
+    0,							/* extra processes */
78 77
     mod_init,					/* module initialization function */
79
-    (response_function) 0,		/* response handling function */
80
-    destroy,					/* destroy function */
78
+    0,							/* response handling function */
79
+    0,							/* destroy function */
81 80
     0							/* per-child init function */
82 81
 };
83 82
 	
... ...
@@ -111,10 +110,3 @@ static int mod_init(void)
111 110
     
112 111
     return 0;
113 112
 }
114
-
115
-static void destroy(void)
116
-{	
117
-    LM_DBG("destroying module ...\n");
118
-
119
-    return;
120
-}
... ...
@@ -44,8 +44,6 @@ MODULE_VERSION
44 44
 
45 45
 /* module functions */
46 46
 static int mod_init(void);
47
-static int child_init(int);
48
-static void destroy(void);
49 47
 
50 48
 /* module variables */
51 49
 add_event_t pres_add_event;
... ...
@@ -63,18 +61,18 @@ static param_export_t params[] = {
63 61
 
64 62
 /* module exports */
65 63
 struct module_exports exports= {
66
-    "presence_mwi",		/* module name */
64
+    "presence_mwi",				/* module name */
67 65
     DEFAULT_DLFLAGS,            /* dlopen flags */
68
-    cmds,			/* exported functions */
69
-    params,			/* exported parameters */
70
-    0,			        /* exported statistics */
71
-    0,				/* exported MI functions */
72
-    0,				/* exported pseudo-variables */
73
-	0,				/* extra processes */
74
-    mod_init,			/* module initialization function */
75
-    (response_function) 0,	/* response handling function */
76
-    destroy,			/* destroy function */
77
-    child_init                  /* per-child init function */
66
+    cmds,						/* exported functions */
67
+    params,						/* exported parameters */
68
+    0,							/* exported statistics */
69
+    0,							/* exported MI functions */
70
+    0,							/* exported pseudo-variables */
71
+	0,							/* extra processes */
72
+    mod_init,					/* module initialization function */
73
+    0,							/* response handling function */
74
+    0,							/* destroy function */
75
+    0							/* per-child init function */
78 76
 };
79 77
 	
80 78
 /*
... ...
@@ -107,17 +105,3 @@ static int mod_init(void)
107 105
     
108 106
     return 0;
109 107
 }
110
-
111
-static int child_init(int rank)
112
-{
113
-    LM_DBG("[%d] pid [%d]\n", rank, getpid());
114
-	
115
-    return 0;
116
-}	
117
-
118
-static void destroy(void)
119
-{	
120
-    LM_DBG("destroying module ...\n");
121
-
122
-    return;
123
-}
... ...
@@ -124,12 +124,12 @@ struct module_exports exports= {
124 124
 	 DEFAULT_DLFLAGS,	/* dlopen flags */
125 125
 	 0,  			/* exported functions */
126 126
 	 params,		/* exported parameters */
127
-	 0,			/* exported statistics */
127
+	 0,				/* exported statistics */
128 128
 	 mi_cmds,		/* exported MI functions */
129
-	 0,			/* exported pseudo-variables */
130
-	 0,			/* extra processes */
129
+	 0,				/* exported pseudo-variables */
130
+	 0,				/* extra processes */
131 131
 	 mod_init,		/* module initialization function */
132
-	 (response_function) 0,	/* response handling function */
132
+	 0,				/* response handling function */
133 133
  	 destroy,		/* destroy function */
134 134
 	 child_init		/* per-child init function */
135 135
 };
... ...
@@ -129,7 +129,7 @@ static param_export_t params[]={
129 129
 /** module exports */
130 130
 struct module_exports exports= {
131 131
 	"pua",						/* module name */
132
-	DEFAULT_DLFLAGS,            /* dlopen flags */
132
+	DEFAULT_DLFLAGS,			/* dlopen flags */
133 133
 	cmds,						/* exported functions */
134 134
 	params,						/* exported parameters */
135 135
 	0,							/* exported statistics */
... ...
@@ -137,9 +137,9 @@ struct module_exports exports= {
137 137
 	0,							/* exported pseudo-variables */
138 138
 	0,							/* extra processes */
139 139
 	mod_init,					/* module initialization function */
140
-	(response_function) 0,		/* response handling function */
140
+	0,							/* response handling function */
141 141
 	destroy,					/* destroy function */
142
-	child_init                  /* per-child init function */
142
+	child_init					/* per-child init function */
143 143
 };
144 144
 	
145 145
 /**
... ...
@@ -256,8 +256,6 @@ static int mod_init(void)
256 256
 
257 257
 static int child_init(int rank)
258 258
 {
259
-	LM_DBG("child [%d]  pid [%d]\n", rank, getpid());
260
-
261 259
 	if (pua_dbf.init==0)
262 260
 	{
263 261
 		LM_CRIT("database not bound\n");
... ...
@@ -282,8 +280,7 @@ static int child_init(int rank)
282 280
 }	
283 281
 
284 282
 static void destroy(void)
285
-{	
286
-	LM_DBG("destroying module ...\n");
283
+{
287 284
 	if (puacb_list)
288 285
 		destroy_puacb_list();
289 286
 
... ...
@@ -47,8 +47,6 @@ str bla_outbound_proxy= {0, 0};
47 47
 int is_bla_aor= 0;
48 48
 str reg_from_uri= {0, 0};
49 49
 static int mod_init(void);
50
-static int child_init(int);
51
-static void destroy(void);
52 50
 
53 51
 send_publish_t pua_send_publish;
54 52
 send_subscribe_t pua_send_subscribe;
... ...
@@ -74,16 +72,16 @@ static param_export_t params[]=
74 72
 struct module_exports exports= {
75 73
 	"pua_bla",					/* module name */
76 74
 	DEFAULT_DLFLAGS,            /* dlopen flags */
77
-	 cmds,						/* exported functions */
78
-	 params,					/* exported parameters */
79
-	 0,							/* exported statistics */
80
-	 0,							/* exported MI functions */
81
-	 0,							/* exported pseudo-variables */
82
-	 0,							/* extra processes */
83
-	 mod_init,					/* module initialization function */
84
-	 (response_function) 0,		/* response handling function */
85
- 	 destroy,					/* destroy function */
86
-	 child_init                 /* per-child init function */
75
+	cmds,						/* exported functions */
76
+	params,						/* exported parameters */
77
+	0,							/* exported statistics */
78
+	0,							/* exported MI functions */
79
+	0,							/* exported pseudo-variables */
80
+	0,							/* extra processes */
81
+	mod_init,					/* module initialization function */
82
+	0,							/* response handling function */
83
+	0,							/* destroy function */
84
+	0							/* per-child init function */
87 85
 };
88 86
 	
89 87
 /**
... ...
@@ -206,18 +204,6 @@ static int mod_init(void)
206 204
 	return 0;
207 205
 }
208 206
 
209
-static int child_init(int rank)
210
-{
211
-	LM_DBG("child [%d]  pid [%d]\n", rank, getpid());
212
-	return 0;
213
-}	
214
-
215
-static void destroy(void)
216
-{	
217
-	LM_DBG("destroying module ...\n");
218
-
219
-	return ;
220
-}
221 207
 
222 208
 int bla_set_flag(struct sip_msg* msg , char* s1, char* s2)
223 209
 {
... ...
@@ -77,7 +77,6 @@ int caller_confirmed    = DEF_CALLER_ALWAYS_CONFIRMED;
77 77
 /** module functions */
78 78
 
79 79
 static int mod_init(void);
80
-static void destroy(void);
81 80
 
82 81
 
83 82
 static cmd_export_t cmds[]=
... ...
@@ -104,8 +103,8 @@ struct module_exports exports= {
104 103
 	0,						/* exported pseudo-variables */
105 104
 	0,						/* extra processes */
106 105
 	mod_init,				/* module initialization function */
107
-	(response_function) 0,	/* response handling function */
108
-	destroy,				/* destroy function */
106
+	0,						/* response handling function */
107
+	0,						/* destroy function */
109 108
 	NULL					/* per-child init function */
110 109
 };
111 110
 	
... ...
@@ -324,13 +323,3 @@ static int mod_init(void)
324 323
 
325 324
 	return 0;
326 325
 }
327
-
328
-static void destroy(void)
329
-{	
330
-	LM_DBG("destroying module ...\n");
331
-
332
-	return ;
333
-}
334
-
335
-
336
-
... ...
@@ -67,17 +67,17 @@ static mi_export_t mi_cmds[] = {
67 67
 /** module exports */
68 68
 struct module_exports exports= {
69 69
 	"pua_mi",					/* module name */
70
-	DEFAULT_DLFLAGS,            /* dlopen flags */
71
-	 0,							/* exported functions */
72
-	 0,							/* exported parameters */
73
-	 0,							/* exported statistics */
74
-	 mi_cmds,					/* exported MI functions */
75
-	 0,							/* exported pseudo-variables */
76
-	 0,							/* extra processes */
77
-	 mod_init,					/* module initialization function */
78
-	 (response_function) 0,		/* response handling function */
79
- 	 destroy,					/* destroy function */
80
-	 0                          /* per-child init function */
70
+	DEFAULT_DLFLAGS,			/* dlopen flags */
71
+	0,							/* exported functions */
72
+	0,							/* exported parameters */
73
+	0,							/* exported statistics */
74
+	mi_cmds,					/* exported MI functions */
75
+	0,							/* exported pseudo-variables */
76
+	0,							/* extra processes */
77
+	mod_init,					/* module initialization function */
78
+	0,							/* response handling function */
79
+	0,							/* destroy function */
80
+	0							/* per-child init function */
81 81
 };
82 82
 	
83 83
 /**
... ...
@@ -122,13 +122,3 @@ static int mod_init(void)
122 122
 
123 123
 	return 0;
124 124
 }
125
-
126
-static void destroy(void)
127
-{	
128
-	LM_DBG("destroying module ...\n");
129
-
130
-	return ;
131
-}
132
-
133
-
134
-
... ...
@@ -60,8 +60,6 @@ usrloc_api_t ul;
60 60
 /** module functions */
61 61
 
62 62
 static int mod_init(void);
63
-static int child_init(int);
64
-static void destroy(void);
65 63
 
66 64
 int pua_set_publish(struct sip_msg* , char*, char*);
67 65
 
... ...
@@ -80,7 +78,7 @@ static param_export_t params[]={
80 78
 
81 79
 struct module_exports exports= {
82 80
 	"pua_usrloc",				/* module name */
83
-	DEFAULT_DLFLAGS,            /* dlopen flags */
81
+	DEFAULT_DLFLAGS,			/* dlopen flags */
84 82
 	cmds,						/* exported functions */
85 83
 	params,						/* exported parameters */
86 84
 	0,							/* exported statistics */
... ...
@@ -88,9 +86,9 @@ struct module_exports exports= {
88 86
 	0,							/* exported pseudo-variables */
89 87
 	0,							/* extra processes */
90 88
 	mod_init,					/* module initialization function */
91
-	(response_function) 0,		/* response handling function */
92
-	destroy,					/* destroy function */
93
-	child_init                  /* per-child init function */
89
+	0,							/* response handling function */
90
+	0,							/* destroy function */
91
+	0							/* per-child init function */
94 92
 };
95 93
 	
96 94
 /**
... ...
@@ -193,19 +191,3 @@ static int mod_init(void)
193 191
 
194 192
 	return 0;
195 193
 }
196
-
197
-static int child_init(int rank)
198
-{
199
-	LM_DBG("child [%d]  pid [%d]\n", rank, getpid());
200
-	return 0;
201
-}	
202
-
203
-static void destroy(void)
204
-{	
205
-	LM_DBG("destroying module ...\n");
206
-
207
-	return ;
208
-}
209
-
210
-
211
-
... ...
@@ -102,18 +102,18 @@ static param_export_t params[]={
102 102
 
103 103
 /*! \brief module exports */
104 104
 struct module_exports exports= {
105
-	"pua_xmpp",                 /* module name */
106
-	DEFAULT_DLFLAGS,            /* dlopen flags */
107
-	cmds,                       /* exported functions */
108
-	params,                     /* exported  parameters */
109
-	0,                          /* exported statistics */
110
-	0,			    /* exported MI functions*/
111
-	0,			    /* exported pseudo-variables */
112
-	0,			    /* extra processes */
113
-	mod_init,                   /* module initialization function */
114
-	(response_function) 0,      /* response handling function */
115
-	(destroy_function) 0,       /* destroy function */
116
-	child_init                  /* per-child init function */
105
+	"pua_xmpp",			/* module name */
106
+	DEFAULT_DLFLAGS,	/* dlopen flags */
107
+	cmds,				/* exported functions */
108
+	params,				/* exported  parameters */
109
+	0,					/* exported statistics */
110
+	0,					/* exported MI functions*/
111
+	0,					/* exported pseudo-variables */
112
+	0,					/* extra processes */
113
+	mod_init,			/* module initialization function */
114
+	0,					/* response handling function */
115
+	0,					/* destroy function */
116
+	child_init			/* per-child init function */
117 117
 };
118 118
 
119 119
 /*! \brief
... ...
@@ -45,8 +45,8 @@ struct module_exports exports= {
45 45
 	0,
46 46
 	0,
47 47
 	0,          /* exported statistics */
48
-	0  ,        /* exported MI functions */
49
-	mod_pvs,  /* exported pseudo-variables */
48
+	0,          /* exported MI functions */
49
+	mod_pvs,    /* exported pseudo-variables */
50 50
 	0,          /* extra processes */
51 51
 	0,          /* module initialization function */
52 52
 	0,
... ...
@@ -263,7 +263,7 @@ struct module_exports exports= {
263 263
 	0,				/* exported pseudo-variables */
264 264
 	0,				/* extra processes */
265 265
 	mod_init,			/* module initialization function */
266
-	(response_function) 0,
266
+	0,
267 267
 	(destroy_function) destroy,	/* module exit function */
268 268
 	0				/* per-child init function */
269 269
 };
... ...
@@ -196,7 +196,7 @@ struct module_exports exports= {
196 196
 	0,							/* exported pseudo-variables */
197 197
 	0,							/* extra processes */
198 198
 	mod_init,					/* module initialization function */
199
-	(response_function) 0,      /* response handling function */
199
+	0,							/* response handling function */
200 200
 	(destroy_function) destroy, /* destroy function */
201 201
 	child_init                  /* per-child init function */
202 202
 };
... ...
@@ -115,7 +115,7 @@ struct module_exports exports=
115 115
    0,
116 116
    0,           /* extra processes */
117 117
    seas_init,   /* module initialization function */
118
-   (response_function) 0,
118
+   0,
119 119
    (destroy_function) seas_exit,   /* module exit function */
120 120
    (child_init_function) seas_child_init  /* per-child init function */
121 121
 };
... ...
@@ -117,7 +117,7 @@ struct module_exports exports= {
117 117
 	0,          /* exported pseudo-variables */
118 118
 	sms_procs,  /* extra processes */
119 119
 	sms_init,   /* module initialization function */
120
-	(response_function) 0,
120
+	0,
121 121
 	(destroy_function) sms_exit,   /* module exit function */
122 122
 	0           /* per-child init function */
123 123
 };
... ...
@@ -117,7 +117,7 @@ struct module_exports exports= {
117 117
 	0,          /* exported pseudo-variables */
118 118
 	0,          /* extra processes */
119 119
 	mod_init,   /* module initialization function */
120
-	(response_function) 0,
120
+	0,
121 121
 	mod_destroy,
122 122
 	0  /* per-child init function */
123 123
 };
... ...
@@ -101,8 +101,8 @@ struct module_exports exports = {
101 101
 	0,        /* exported pseudo-variables */
102 102
 	0,        /* extra processes */
103 103
 	redirect_init, /* Module initialization function */
104
-	(response_function) 0,
105
-	(destroy_function) 0,
104
+	0,
105
+	0,
106 106
 	(child_init_function) 0 /* per-child init function */
107 107
 };
108 108
 
... ...
@@ -110,9 +110,9 @@ struct module_exports exports= {
110 110
 	0,							/* exported pseudo-variables */
111 111
 	0,							/* extra processes */
112 112
 	mod_init,					/* module initialization function */
113
-	(response_function) 0,      /* response handling function */
113
+	0,							/* response handling function */
114 114
 	(destroy_function) destroy, /* destroy function */
115
-	0                           /* per-child init function */
115
+	0							/* per-child init function */
116 116
 };
117 117
 
118 118
 /**
... ...
@@ -112,7 +112,7 @@ struct module_exports exports= {
112 112
 	mod_items,  /* exported pseudo-variables */
113 113
 	0,          /* extra processes */
114 114
 	mod_init,   /* module initialization function */
115
-	(response_function) 0,
115
+	0,
116 116
 	(destroy_function) destroy,
117 117
 	0           /* per-child init function */
118 118
 };