X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-export.c;h=840bd9190331dc8a1f96289ed252c678eba23bad;hb=66df82496e8b5cf0e49e8fe4ddd57827bbd0e3c5;hp=304395aedd7f5efa8724b5c76c24943142b592f7;hpb=e1b255b4c6486b0d2df5cd8b2aad8b817876ddf2;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-export.c b/src/afb-export.c
index 304395ae..840bd919 100644
--- a/src/afb-export.c
+++ b/src/afb-export.c
@@ -153,8 +153,6 @@ static void old_vverbose_cb(void *closure, int level, const char *file, int line
 
 static struct afb_eventid *eventid_make_cb(void *closure, const char *name)
 {
-	size_t plen, nlen;
-	char *event;
 	struct afb_export *export = closure;
 
 	/* check daemon state */
@@ -164,16 +162,8 @@ static struct afb_eventid *eventid_make_cb(void *closure, const char *name)
 		return NULL;
 	}
 
-	/* makes the event name */
-	plen = strlen(export->apiname);
-	nlen = strlen(name);
-	event = alloca(nlen + plen + 2);
-	memcpy(event, export->apiname, plen);
-	event[plen] = '/';
-	memcpy(event + plen + 1, name, nlen + 1);
-
 	/* create the event */
-	return afb_evt_eventid_create(event);
+	return afb_evt_eventid_create2(export->apiname, name);
 }
 
 static struct afb_event event_make_cb(void *closure, const char *name)
@@ -241,7 +231,7 @@ static int rename_api_cb(void *closure, const char *name)
 		errno = EINVAL;
 		return -1;
 	}
-	if (!afb_api_is_valid_name(name)) {
+	if (!afb_api_is_valid_name(name, 1)) {
 		ERROR("[API %s] Can't rename to %s: bad API name", export->apiname, name);
 		errno = EINVAL;
 		return -1;