X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-evt.c;h=1c81fd53bee206ff6ef9c9218325185d72668a47;hb=170aef20bc3a59d5139c2eff8794d9ba4c83a2e5;hp=0979db8229c4e4a3bfa2113820eb2fb8663305bc;hpb=fbe9349a747aba8d7c8c27e51cdd8c3c5ef8b39c;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-evt.c b/src/afb-evt.c
index 0979db82..1c81fd53 100644
--- a/src/afb-evt.c
+++ b/src/afb-evt.c
@@ -312,7 +312,7 @@ static void evt_destroy(struct afb_evt_event *evt)
 struct afb_event afb_evt_create_event(const char *name)
 {
 	size_t len;
-	struct afb_evt_event *evt;
+	struct afb_evt_event *evt, *oevt;
 
 	/* allocates the event */
 	len = strlen(name);
@@ -320,10 +320,6 @@ struct afb_event afb_evt_create_event(const char *name)
 	if (evt == NULL)
 		goto error;
 
-	/* initialize the event */
-	evt->watchs = NULL;
-	memcpy(evt->name, name, len + 1);
-
 	/* allocates the id */
 	pthread_mutex_lock(&events_mutex);
 	do {
@@ -333,10 +329,10 @@ struct afb_event afb_evt_create_event(const char *name)
 		}
 		if (!event_id_wrapped)
 			break;
-		evt = events;
-		while(evt != NULL && evt->id != event_id_counter)
-			evt = evt->next;
-	} while (evt != NULL);
+		oevt = events;
+		while(oevt != NULL && oevt->id != event_id_counter)
+			oevt = oevt->next;
+	} while (oevt != NULL);
 
 	/* initialize the event */
 	memcpy(evt->name, name, len + 1);