[svn-commits] file: trunk r89290 - in /trunk/channels: chan_h323.c chan_sip.c misdn_config.c

[SVN commits to the Digium repositories]

Author: file
Date: Thu Nov 15 09:21:04 2007
New Revision: 89290

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89290
Log:
And file said... let trunk build again! Accomplished by some more constification, and marking a function in chan_sip as purposely unused until it is fixed up.

Modified:
    trunk/channels/chan_h323.c
    trunk/channels/chan_sip.c
    trunk/channels/misdn_config.c

Modified: trunk/channels/chan_h323.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_h323.c?view=diff&rev=89290&r1=89289&r2=89290
==============================================================================
--- trunk/channels/chan_h323.c (original)
+++ trunk/channels/chan_h323.c Thu Nov 15 09:21:04 2007
@@ -1362,7 +1362,7 @@
 	return 0;
 }
 
-static struct oh323_user *build_user(char *name, struct ast_variable *v, struct ast_variable *alt, int realtime)
+static struct oh323_user *build_user(const char *name, struct ast_variable *v, struct ast_variable *alt, int realtime)
 {
 	struct oh323_user *user;
 	struct ast_ha *oldha;
@@ -1446,7 +1446,7 @@
 {
 	struct ast_variable *var, *tmp;
 	struct oh323_user *user;
-	char *username;
+	const char *username;
 
 	if (userbyalias)
 		var = ast_load_realtime("h323", "name", username = cd->call_source_aliases, NULL);

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=89290&r1=89289&r2=89290
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Thu Nov 15 09:21:04 2007
@@ -9951,7 +9951,7 @@
  * Note that ast_sip_ouraddrfor() still rewrites p->ourip
  * if you specify externip/seternaddr/stunaddr.
  */
-static void check_via_response(struct sip_pvt *p, struct sip_request *req)
+static attribute_unused void check_via_response(struct sip_pvt *p, struct sip_request *req)
 {
 	char via[256];
 	char *cur, *opts;

Modified: trunk/channels/misdn_config.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/misdn_config.c?view=diff&rev=89290&r1=89289&r2=89290
==============================================================================
--- trunk/channels/misdn_config.c (original)
+++ trunk/channels/misdn_config.c Thu Nov 15 09:21:04 2007
@@ -435,7 +435,7 @@
 	return 0;
 }
 
-static int get_cfg_position (char *name, int type)
+static int get_cfg_position (const char *name, int type)
 {
 	int i;
 
@@ -861,11 +861,12 @@
 	return (p > 0) ? p : misdn_cfg_get_next_port(0);
 }
 
-static int _parse (union misdn_cfg_pt *dest, char *value, enum misdn_cfg_type type, int boolint_def)
+static int _parse (union misdn_cfg_pt *dest, const char *value, enum misdn_cfg_type type, int boolint_def)
 {
 	int re = 0;
 	int len, tmp;
 	char *valtmp;
+	char *tmp2 = ast_strdupa(value);
 
 	switch (type) {
 	case MISDN_CTYPE_STR:
@@ -905,7 +906,7 @@
 		}
 		break;
 	case MISDN_CTYPE_MSNLIST:
-		for (valtmp = strsep(&value, ","); valtmp; valtmp = strsep(&value, ",")) {
+		for (valtmp = strsep(&tmp2, ","); valtmp; valtmp = strsep(&tmp2, ",")) {
 			if ((len = strlen(valtmp))) {
 				struct msn_list *ml = ast_malloc(sizeof(*ml));
 				ml->msn = ast_calloc(len+1, sizeof(char));
@@ -961,10 +962,10 @@
 
 	for (; v; v = v->next) {
 		if (!strcasecmp(v->name, "ports")) {
-			char *token;
+			char *token, *tmp = ast_strdupa(v->value);
 			char ptpbuf[BUFFERSIZE] = "";
 			int start, end;
-			for (token = strsep(&v->value, ","); token; token = strsep(&v->value, ","), *ptpbuf = 0) { 
+			for (token = strsep(&tmp, ","); token; token = strsep(&tmp, ","), *ptpbuf = 0) { 
 				if (!*token)
 					continue;
 				if (sscanf(token, "%d-%d%s", &start, &end, ptpbuf) >= 2) {