Browse code

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

Jan Janak authored on 11/04/2006 13:02:03
Showing 3 changed files
... ...
@@ -354,7 +354,7 @@ static int fixup_t_reply(void** param, int param_no)
354 354
 	} else if (param_no == 2) {
355 355
 		ret = fix_param(FPARAM_AVP, param);
356 356
 		if (ret <= 0) return ret;
357
-		return fix_param(FPARAM_ASCIIZ, param);
357
+		return fix_param(FPARAM_STRING, param);
358 358
 	}
359 359
     return 0;
360 360
 }
... ...
@@ -439,7 +439,7 @@ static int fixup_proto_hostport2proxy(void** param, int param_no) {
439 439
                 ret = fix_param(FPARAM_INT, param);
440 440
 		if (ret <= 0) return ret;
441 441
 	} */
442
-	return fix_param(FPARAM_ASCIIZ, param);
442
+	return fix_param(FPARAM_STRING, param);
443 443
 }
444 444
 
445 445
 
... ...
@@ -665,7 +665,7 @@ inline static struct proxy_l* t_protoaddr2proxy(char *proto_par, char *addr_par)
665 665
 	case FPARAM_INT:
666 666
 		proto = ((fparam_t *)proto_par)->v.i;
667 667
 		break;
668
-	case FPARAM_ASCIIZ:
668
+	case FPARAM_STRING:
669 669
 		proto = str2proto( ((fparam_t *)proto_par)->v.asciiz, strlen(((fparam_t *)proto_par)->v.asciiz));
670 670
 		break;
671 671
 	default:
... ...
@@ -688,7 +688,7 @@ inline static struct proxy_l* t_protoaddr2proxy(char *proto_par, char *addr_par)
688 688
 		}
689 689
 		break;
690 690
 
691
-	case FPARAM_ASCIIZ:
691
+	case FPARAM_STRING:
692 692
 		s.s = ((fparam_t *) addr_par)->v.asciiz;
693 693
 		s.len = strlen(s.s);
694 694
 		break;
... ...
@@ -835,7 +835,7 @@ static int get_param_val(int* code, char** reason, fparam_t* c, fparam_t* r) {
835 835
 		}
836 836
 		break;
837 837
 
838
-	case FPARAM_ASCIIZ:
838
+	case FPARAM_STRING:
839 839
 		*reason = r->v.asciiz;
840 840
 		break;
841 841
 
... ...
@@ -1121,7 +1121,7 @@ int w_t_reply_wrp(struct sip_msg *m, unsigned int code, char *txt)
1121 1121
 	c.orig = NULL; /* ? */
1122 1122
 	c.v.i = code;
1123 1123
 	
1124
-	r.type = FPARAM_ASCIIZ;
1124
+	r.type = FPARAM_STRING;
1125 1125
 	r.orig = NULL; /* ? */
1126 1126
 	r.v.asciiz = txt;
1127 1127
 
... ...
@@ -750,7 +750,7 @@ int fix_param(int type, void** param)
750 750
 		ERR("fix_param: Invalid type value\n");
751 751
 		goto error;
752 752
 
753
-	case FPARAM_ASCIIZ:
753
+	case FPARAM_STRING:
754 754
 		p->v.asciiz = *param;
755 755
 		break;
756 756
 
... ...
@@ -112,7 +112,7 @@ struct param_export_ {
112 112
 
113 113
 enum {
114 114
 	FPARAM_UNSPEC = 0,
115
-	FPARAM_ASCIIZ = (1 << 0),
115
+	FPARAM_STRING = (1 << 0),
116 116
 	FPARAM_STR    = (1 << 1),
117 117
 	FPARAM_INT    = (1 << 2),
118 118
 	FPARAM_REGEX  = (1 << 3),