Browse code

- warnings for solaris - compilation fixes for gcc 2.95

Andrei Pelinescu-Onciul authored on 12/02/2007 20:19:39
Showing 2 changed files
... ...
@@ -887,11 +887,12 @@ error_fwd_uri:
887 887
 int run_actions(struct action* a, struct sip_msg* msg)
888 888
 {
889 889
 	struct action* t;
890
-	int ret=E_UNSPEC;
890
+	int ret;
891 891
 	static int rec_lev=0;
892 892
 	static jmp_buf jmp_env;
893 893
 	struct sr_module *mod;
894 894
 
895
+	ret=E_UNSPEC;
895 896
 	rec_lev++;
896 897
 	if (rec_lev>ROUTE_MAX_REC_LEV){
897 898
 		LOG(L_ERR, "WARNING: too many recursive routing table lookups (%d)"
... ...
@@ -72,13 +72,14 @@ int w_parse_select(char**p, select_t* sel)
72 72
 	
73 73
 	if (**p=='@') (*p)++;
74 74
 	sel->n=0;
75
-	while (isalpha(*(*p))) {
75
+	while (isalpha((unsigned char)*(*p))) {
76 76
 		if (sel->n > MAX_SELECT_PARAMS -2) {
77 77
 			ERR("parse_select: select depth exceeds max\n");
78 78
 			goto error;
79 79
 		}
80 80
 		name.s=(*p);
81
-		while (isalpha(*(*p)) || isdigit(*(*p)) || (*(*p)=='_')) (*p)++;
81
+		while (isalpha((unsigned char)*(*p)) || 
82
+				isdigit((unsigned char)*(*p)) || (*(*p)=='_')) (*p)++;
82 83
 		name.len=(*p)-name.s;
83 84
 		sel->params[sel->n].type=SEL_PARAM_STR;
84 85
 		sel->params[sel->n].v.s=name;
... ...
@@ -103,7 +104,7 @@ int w_parse_select(char**p, select_t* sel)
103 103
 			} else {
104 104
 				name.s=(*p);
105 105
 				if (*(*p)=='-') (*p)++;
106
-				while (isdigit(*(*p))) (*p)++;
106
+				while (isdigit((unsigned char)*(*p))) (*p)++;
107 107
 				name.len=(*p)-name.s;
108 108
 				if (*(*p)!=']') {
109 109
 					ERR("parse_select: invalid index, no closing ]\n");
... ...
@@ -174,7 +175,7 @@ int resolve_select(select_t* s)
174 174
 	int nested;
175 175
 	int param_idx = 0;
176 176
 	int table_idx = 0;
177
-	select_table_t* t = NULL;;
177
+	select_table_t* t = NULL;
178 178
 	int accept = 0;
179 179
 
180 180
 	f = NULL;