From: Olivier Matz <zer0@droids-corp.org>
Date: Mon, 21 Feb 2011 22:58:38 +0000 (+0100)
Subject: cmdline: parse() method does not return token_len anymore
X-Git-Url: http://git.droids-corp.org/?p=libcmdline.git;a=commitdiff_plain;h=0a09866300194a46a58ff4dc0b837e01305f4444

cmdline: parse() method does not return token_len anymore

Signed-off-by: Olivier Matz <zer0@droids-corp.org>
---

diff --git a/src/extension_example/parse_obj_list.c b/src/extension_example/parse_obj_list.c
index 9869e09..34772b9 100644
--- a/src/extension_example/parse_obj_list.c
+++ b/src/extension_example/parse_obj_list.c
@@ -66,7 +66,7 @@ parse_obj_list(cmdline_parse_token_hdr_t *tk, const char *buf, void *res,
 	if (res)
 		*(struct object **)res = o;
 
-	return token_len;
+	return 0;
 }
 
 static int
diff --git a/src/genconf/parse_confnode.c b/src/genconf/parse_confnode.c
index 2a9ed06..382bfde 100644
--- a/src/genconf/parse_confnode.c
+++ b/src/genconf/parse_confnode.c
@@ -133,7 +133,7 @@ parse_conf_node(cmdline_parse_token_hdr_t *tk, const char *buf, void *res,
 	if (res)
 		*(struct confnode **)res = TAILQ_FIRST(&l);
 
-	return token_len;
+	return 0;
 }
 
 struct confnode_complete_callback {
diff --git a/src/lib/cmdline_parse_etheraddr.c b/src/lib/cmdline_parse_etheraddr.c
index 3c0f30b..bd2717a 100644
--- a/src/lib/cmdline_parse_etheraddr.c
+++ b/src/lib/cmdline_parse_etheraddr.c
@@ -122,7 +122,7 @@ cmdline_parse_etheraddr(__attribute__((unused)) cmdline_parse_token_hdr_t *tk,
 		return -1;
 
 	memcpy(&etheraddr, tmp, sizeof(etheraddr));
-	return token_len;
+	return 0;
 }
 
 static int
diff --git a/src/lib/cmdline_parse_ipaddr.c b/src/lib/cmdline_parse_ipaddr.c
index eab2319..bcd12a4 100644
--- a/src/lib/cmdline_parse_ipaddr.c
+++ b/src/lib/cmdline_parse_ipaddr.c
@@ -322,12 +322,12 @@ cmdline_parse_ipaddr(cmdline_parse_token_hdr_t *tk, const char *buf, void *res,
 	if ((tk2->ipaddr_data.flags & CMDLINE_IPADDR_V4) &&
 	    my_inet_pton(AF_INET, ip_str, &ipaddr->addr.ipv4) == 1) {
 		ipaddr->family = AF_INET;
-		return token_len;
+		return 0;
 	}
 	if ((tk2->ipaddr_data.flags & CMDLINE_IPADDR_V6) &&
 	    my_inet_pton(AF_INET6, ip_str, &ipaddr->addr.ipv6) == 1) {
 		ipaddr->family = AF_INET6;
-		return token_len;
+		return 0;
 	}
 	return -1;
 
diff --git a/src/lib/cmdline_parse_num.c b/src/lib/cmdline_parse_num.c
index 31ca78d..dee3ebe 100644
--- a/src/lib/cmdline_parse_num.c
+++ b/src/lib/cmdline_parse_num.c
@@ -396,43 +396,43 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf,
 		if ( nd.type == INT8 && res1 <= INT8_MAX ) {
 			if (res)
 				*(int8_t *)res = (int8_t) res1;
-			return (buf-srcbuf);
+			return 0;
 		}
 		else if ( nd.type == INT16 && res1 <= INT16_MAX ) {
 			if (res)
 				*(int16_t *)res = (int16_t) res1;
-			return (buf-srcbuf);
+			return 0;
 		}
 		else if ( nd.type == INT32 && res1 <= INT32_MAX ) {
 			if (res)
 				*(int32_t *)res = (int32_t) res1;
-			return (buf-srcbuf);
+			return 0;
 		}
 		else if ( nd.type == UINT8 && res1 <= UINT8_MAX ) {
 			if (res)
 				*(uint8_t *)res = (uint8_t) res1;
-			return (buf-srcbuf);
+			return 0;
 		}
 		else if (nd.type == UINT16  && res1 <= UINT16_MAX ) {
 			if (res)
 				*(uint16_t *)res = (uint16_t) res1;
-			return (buf-srcbuf);
+			return 0;
 		}
 		else if ( nd.type == UINT32 ) {
 			if (res)
 				*(uint32_t *)res = (uint32_t) res1;
-			return (buf-srcbuf);
+			return 0;
 		}
 		else if ( nd.type == UINT64 ) {
 			if (res)
 				*(uint64_t *)res = res1;
-			return (buf-srcbuf);
+			return 0;
 		}
 #ifdef CMDLINE_HAVE_FLOAT
 		else if ( nd.type == FLOAT ) {
 			if (res)
 				*(float *)res = (float)res1;
-			return (buf-srcbuf);
+			return 0;
 		}
 #endif
 		else {
@@ -444,23 +444,23 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf,
 		if ( nd.type == INT8 && res1 <= INT8_MAX + 1 ) {
 			if (res)
 				*(int8_t *)res = (int8_t) (-res1);
-			return (buf-srcbuf);
+			return 0;
 		}
 		else if ( nd.type == INT16 && res1 <= (uint16_t)INT16_MAX + 1 ) {
 			if (res)
 				*(int16_t *)res = (int16_t) (-res1);
-			return (buf-srcbuf);
+			return 0;
 		}
 		else if ( nd.type == INT32 && res1 <= (uint32_t)INT32_MAX + 1 ) {
 			if (res)
 				*(int32_t *)res = (int32_t) (-res1);
-			return (buf-srcbuf);
+			return 0;
 		}
 #ifdef CMDLINE_HAVE_FLOAT
 		else if ( nd.type == FLOAT ) {
 			if (res)
 				*(float *)res = - (float)res1;
-			return (buf-srcbuf);
+			return 0;
 		}
 #endif
 		else {
@@ -474,7 +474,7 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf,
 		if ( nd.type == FLOAT ) {
 			if (res)
 				*(float *)res = (float)res1 + ((float)res2 / (float)res3);
-			return (buf-srcbuf);
+			return 0;
 
 		}
 		else {
@@ -487,7 +487,7 @@ cmdline_parse_num(cmdline_parse_token_hdr_t *tk, const char *srcbuf,
 		if ( nd.type == FLOAT ) {
 			if (res)
 				*(float *)res = - ((float)res1 + ((float)res2 / (float)res3));
-			return (buf-srcbuf);
+			return 0;
 
 		}
 		else {
diff --git a/src/lib/cmdline_parse_string.c b/src/lib/cmdline_parse_string.c
index b99a278..9c76e29 100644
--- a/src/lib/cmdline_parse_string.c
+++ b/src/lib/cmdline_parse_string.c
@@ -146,7 +146,7 @@ cmdline_parse_string(cmdline_parse_token_hdr_t *tk, const char *buf, void *res,
 	if (res)
 		strcpy(res, buf);
 
-	return token_len;
+	return 0;
 }
 
 static int