Browse code

Merge pull request #1076 from mslehto/deadcode

core: dead code and ser string removal

Daniel-Constantin Mierla authored on 19/04/2017 06:07:30 • GitHub committed on 19/04/2017 06:07:30
Showing 6 changed files
... ...
@@ -35,8 +35,6 @@
35 35
 #ifndef config_h
36 36
 #define config_h
37 37
 
38
-#include "types.h"
39
-
40 38
 #define SIP_PORT  5060 /*!< default SIP port if none specified */
41 39
 #define SIPS_PORT 5061 /*!< default SIP port for TLS if none specified */
42 40
 
... ...
@@ -32,7 +32,6 @@
32 32
 #ifndef globals_h
33 33
 #define globals_h
34 34
 
35
-#include "types.h"
36 35
 #include "ip_addr.h"
37 36
 #include "str.h"
38 37
 #include "poll_types.h"
... ...
@@ -113,7 +112,6 @@ extern int dont_daemonize;
113 112
 extern int check_via;
114 113
 extern int phone2tel;
115 114
 extern int received_dns;
116
-/* extern int process_no; */
117 115
 extern int child_rank;
118 116
 extern int sip_warning;
119 117
 extern int server_signature;
... ...
@@ -144,12 +142,6 @@ extern int auto_bind_ipv6;
144 142
 extern int tos;
145 143
 extern int pmtu_discovery;
146 144
 
147
-/*
148
- * debug & log_stderr moved to dprint.h*/
149
-
150
-/* extern process_bm_t process_bit; */
151
-/* extern int *pids; -moved to pt.h */
152
-
153 145
 extern int cfg_errors;
154 146
 extern int cfg_warnings;
155 147
 extern unsigned int msg_no;
... ...
@@ -160,11 +152,6 @@ extern unsigned long pkg_mem_size;
160 152
 /* AVP configuration */
161 153
 extern char *avp_db_url;  /* db url used by user preferences (AVPs) */
162 154
 
163
-/* moved to pt.h
164
-extern int *pids;
165
-extern int process_no;
166
-*/
167
-
168 155
 extern int reply_to_via;
169 156
 
170 157
 extern int is_main;
... ...
@@ -993,7 +993,7 @@ int fix_actions(struct action* a)
993 993
 				si=find_si(&ip, ((struct socket_id*)t->val[0].u.data)->port,
994 994
 								((struct socket_id*)t->val[0].u.data)->proto);
995 995
 				if (si==0){
996
-					LM_ERR("bad force_send_socket argument: %s:%d (ser doesn't listen on it)\n",
996
+					LM_ERR("bad force_send_socket argument: %s:%d (" NAME " doesn't listen on it)\n",
997 997
 						((struct socket_id*)t->val[0].u.data)->addr_lst->name,
998 998
 							((struct socket_id*)t->val[0].u.data)->port);
999 999
 					ret = E_BAD_ADDRESS;
1000 1000
deleted file mode 100644
... ...
@@ -1,32 +0,0 @@
1
-/*
2
- * Copyright (C) 2001-2003 FhG Fokus
3
- *
4
- * This file is part of Kamailio, a free SIP server.
5
- *
6
- * Kamailio is free software; you can redistribute it and/or modify
7
- * it under the terms of the GNU General Public License as published by
8
- * the Free Software Foundation; either version 2 of the License, or
9
- * (at your option) any later version
10
- *
11
- * For a license to use the Kamailio software under conditions
12
- * other than those described here, or to purchase support for this
13
- * software, please contact iptel.org by e-mail at the following addresses:
14
- *    info@iptel.org
15
- *
16
- * Kamailio is distributed in the hope that it will be useful,
17
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
18
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
19
- * GNU General Public License for more details.
20
- *
21
- * You should have received a copy of the GNU General Public License 
22
- * along with this program; if not, write to the Free Software 
23
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
24
- */
25
-
26
-
27
-#ifndef _TYPES_H_
28
-#define _TYPES_H_
29
-
30
-typedef unsigned int process_bm_t;
31
-
32
-#endif
... ...
@@ -471,10 +471,6 @@ int child_rank = 0;
471 471
 /* how much to wait for children to terminate, before taking extreme measures*/
472 472
 int ser_kill_timeout=DEFAULT_SER_KILL_TIMEOUT;
473 473
 
474
-/* process_bm_t process_bit = 0; */
475
-#ifdef ROUTE_SRV
476
-#endif
477
-
478 474
 /* cfg parsing */
479 475
 int cfg_errors=0;
480 476
 int cfg_warnings=0;
... ...
@@ -1364,7 +1360,6 @@ int main_loop(void)
1364 1360
 				if (pid==0){
1365 1361
 					/* child */
1366 1362
 					/* timer!*/
1367
-					/* process_bit = 0; */
1368 1363
 					if (real_time&2)
1369 1364
 						set_rt_prio(rt_timer2_prio, rt_timer2_policy);
1370 1365
 
... ...
@@ -1383,7 +1378,6 @@ int main_loop(void)
1383 1378
 				if (pid==0){
1384 1379
 					/* child */
1385 1380
 					/* timer!*/
1386
-					/* process_bit = 0; */
1387 1381
 					if (real_time&1)
1388 1382
 						set_rt_prio(rt_timer1_prio, rt_timer1_policy);
1389 1383
 					if (arm_timer()<0) goto error;
... ...
@@ -46,7 +46,6 @@
46 46
 
47 47
 #include "../../core/clist.h"
48 48
 #include "../../core/parser/msg_parser.h"
49
-#include "../../core/types.h"
50 49
 #include "../../core/md5utils.h"
51 50
 #include "../../core/usr_avp.h"
52 51
 #ifdef WITH_XAVP