From: José Bollo <jose.bollo@iot.bzh>
Date: Thu, 20 Apr 2017 07:35:23 +0000 (+0200)
Subject: Use of 'afb_api_is_valid_name'
X-Git-Tag: dab_3.99.1~47
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=af552129e778954878a3a3b4e0138fdb2c1f2602;p=src%2Fapp-framework-binder.git

Use of 'afb_api_is_valid_name'

Use the common function 'afb_api_is_valid_name'
instead of 'afb_apiset_valid_name'.

Change-Id: I2d761473d4aa1cd90adf1b7a2c1976e727b437fc
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
---

diff --git a/src/afb-apiset.c b/src/afb-apiset.c
index d9a4e5e8..cf054460 100644
--- a/src/afb-apiset.c
+++ b/src/afb-apiset.c
@@ -91,42 +91,6 @@ static const struct api_desc *search(struct afb_apiset *set, const char *name)
 }
 
 /**
- * Checks wether 'name' is a valid API name.
- * @return 1 if valid, 0 otherwise
- */
-int afb_apiset_valid_name(const char *name)
-{
-	unsigned char c;
-
-	c = (unsigned char)*name;
-	if (c == 0)
-		/* empty names aren't valid */
-		return 0;
-
-	do {
-		if (c < (unsigned char)'\x80') {
-			switch(c) {
-			default:
-				if (c > ' ')
-					break;
-			case '"':
-			case '#':
-			case '%':
-			case '&':
-			case '\'':
-			case '/':
-			case '?':
-			case '`':
-			case '\\':
-			case '\x7f':
-				return 0;
-			}
-		}
-		c = (unsigned char)*++name;
-	} while(c != 0);
-	return 1;
-}
-
 struct afb_apiset *afb_apiset_addref(struct afb_apiset *set)
 {
 	if (set)
@@ -225,7 +189,7 @@ int afb_apiset_add(struct afb_apiset *set, const char *name, struct afb_api api)
 	int i, c;
 
 	/* Checks the api name */
-	if (!afb_apiset_valid_name(name)) {
+	if (!afb_api_is_valid_name(name)) {
 		ERROR("invalid api name forbidden (name is '%s')", name);
 		errno = EINVAL;
 		goto error;