Browse Source

- parse_nameaddr doesn't log any error messages anymore (sometimes it's called
to check if a string is in nameaddr format, for example from the avp module)
- if parse_nameaddr fails in parse_rr, parse_rr will log the failed "uri".

Andrei Pelinescu-Onciul 17 years ago
parent
commit
b0c5ec1d3e
2 changed files with 3 additions and 8 deletions
  1. 1 7
      parser/parse_nameaddr.c
  2. 2 1
      parser/parse_rr.c

+ 1 - 7
parser/parse_nameaddr.c

@@ -46,7 +46,6 @@ int parse_nameaddr(str* _s, name_addr_t* _a)
 	char* uri_end;
 
 	if (!_s || !_a) {
-		LOG(L_ERR, "parse_nameaddr(): Invalid parameter value\n");
 		return -1;
 	}
 
@@ -57,8 +56,6 @@ int parse_nameaddr(str* _s, name_addr_t* _a)
 		_a->name.len = _a->uri.s - _a->name.s;
 		_a->uri.s++; /* We will skip < character */
 	} else {
-		LOG(L_ERR, "parse_nameaddr(): No < found in (%.*s)\n", _s->len,
-					ZSW(_s->s));
 		return -3;
 	}
 	
@@ -66,12 +63,9 @@ int parse_nameaddr(str* _s, name_addr_t* _a)
 	uri_end = find_not_quoted(&_a->uri, '>');
 	
 	if (!uri_end) {
-		LOG(L_ERR, "parse_nameaddr(): No > found in (%.*s)\n", _s->len,
-					ZSW(_s->s));
 		return -4;
 	}
-
-	     /* Total length of the field including <> */
+	/* Total length of the field including <> */
 	_a->len = uri_end - _a->name.s + 1;
 	
 	_a->uri.len = uri_end - _a->uri.s;

+ 2 - 1
parser/parse_rr.c

@@ -74,7 +74,8 @@ static inline int do_parse_rr_body(char *buf, int len, rr_t **head)
 		
 		     /* Parse name-addr part of the header */
 		if (parse_nameaddr(&s, &r->nameaddr) < 0) {
-			LOG(L_ERR, "parse_rr(): Error while parsing name-addr\n");
+			LOG(L_ERR, "parse_rr(): Error while parsing name-addr (%.*s)\n",
+					s.len, ZSW(s.s));
 			goto error;
 		}
 		r->len = r->nameaddr.len;