瀏覽代碼

- cosmetic change, FPARAM_ASCIIZ renamed to FPARAM_STRING
Closes SER-102

Jan Janak 19 年之前
父節點
當前提交
2c51118951
共有 3 個文件被更改,包括 8 次插入8 次删除
  1. 6 6
      modules/tm/tm.c
  2. 1 1
      sr_module.c
  3. 1 1
      sr_module.h

+ 6 - 6
modules/tm/tm.c

@@ -354,7 +354,7 @@ static int fixup_t_reply(void** param, int param_no)
 	} else if (param_no == 2) {
 		ret = fix_param(FPARAM_AVP, param);
 		if (ret <= 0) return ret;
-		return fix_param(FPARAM_ASCIIZ, param);
+		return fix_param(FPARAM_STRING, param);
 	}
     return 0;
 }
@@ -439,7 +439,7 @@ static int fixup_proto_hostport2proxy(void** param, int param_no) {
                 ret = fix_param(FPARAM_INT, param);
 		if (ret <= 0) return ret;
 	} */
-	return fix_param(FPARAM_ASCIIZ, param);
+	return fix_param(FPARAM_STRING, param);
 }
 
 
@@ -665,7 +665,7 @@ inline static struct proxy_l* t_protoaddr2proxy(char *proto_par, char *addr_par)
 	case FPARAM_INT:
 		proto = ((fparam_t *)proto_par)->v.i;
 		break;
-	case FPARAM_ASCIIZ:
+	case FPARAM_STRING:
 		proto = str2proto( ((fparam_t *)proto_par)->v.asciiz, strlen(((fparam_t *)proto_par)->v.asciiz));
 		break;
 	default:
@@ -688,7 +688,7 @@ inline static struct proxy_l* t_protoaddr2proxy(char *proto_par, char *addr_par)
 		}
 		break;
 
-	case FPARAM_ASCIIZ:
+	case FPARAM_STRING:
 		s.s = ((fparam_t *) addr_par)->v.asciiz;
 		s.len = strlen(s.s);
 		break;
@@ -835,7 +835,7 @@ static int get_param_val(int* code, char** reason, fparam_t* c, fparam_t* r) {
 		}
 		break;
 
-	case FPARAM_ASCIIZ:
+	case FPARAM_STRING:
 		*reason = r->v.asciiz;
 		break;
 
@@ -1121,7 +1121,7 @@ int w_t_reply_wrp(struct sip_msg *m, unsigned int code, char *txt)
 	c.orig = NULL; /* ? */
 	c.v.i = code;
 	
-	r.type = FPARAM_ASCIIZ;
+	r.type = FPARAM_STRING;
 	r.orig = NULL; /* ? */
 	r.v.asciiz = txt;
 

+ 1 - 1
sr_module.c

@@ -750,7 +750,7 @@ int fix_param(int type, void** param)
 		ERR("fix_param: Invalid type value\n");
 		goto error;
 
-	case FPARAM_ASCIIZ:
+	case FPARAM_STRING:
 		p->v.asciiz = *param;
 		break;
 

+ 1 - 1
sr_module.h

@@ -112,7 +112,7 @@ struct param_export_ {
 
 enum {
 	FPARAM_UNSPEC = 0,
-	FPARAM_ASCIIZ = (1 << 0),
+	FPARAM_STRING = (1 << 0),
 	FPARAM_STR    = (1 << 1),
 	FPARAM_INT    = (1 << 2),
 	FPARAM_REGEX  = (1 << 3),