X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-session.c;h=61bce09a8c4fc00528cef643ad139b7de31ba34d;hb=7b42076a77b81e205ecc704c3bb7538716567487;hp=db7a99a3fc8cdadc5d6047fe7d43dc343867b5be;hpb=9ece61d2cbda88878b9f1e6a6e62d3d42cbdef00;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-session.c b/src/afb-session.c
index db7a99a3..61bce09a 100644
--- a/src/afb-session.c
+++ b/src/afb-session.c
@@ -433,7 +433,7 @@ static struct cookie *cookie_add(struct afb_session *session, int idx, const voi
 	return cookie;
 }
 
-void *afb_session_cookie(struct afb_session *session, const void *key, void *(*makecb)(void), void (*freecb)(void*))
+void *afb_session_cookie(struct afb_session *session, const void *key, void *(*makecb)(void *closure), void (*freecb)(void *item), void *closure, int replace)
 {
 	int idx;
 	void *value;
@@ -441,11 +441,19 @@ void *afb_session_cookie(struct afb_session *session, const void *key, void *(*m
 
 	lock(session);
 	cookie = cookie_search(session, key, &idx);
-	if (cookie)
-		value = cookie->value;
-	else {
-		value = makecb ? makecb() : NULL;
-		if (makecb || freecb) {
+	if (cookie) {
+		if (!replace)
+			value = cookie->value;
+		else {
+			value = makecb ? makecb(closure) : closure;
+			if (cookie->value != value && cookie->freecb)
+				cookie->freecb(cookie->value);
+			cookie->value = value;
+			cookie->freecb = freecb;
+		}
+	} else {
+		value = makecb ? makecb(closure) : closure;
+		if (replace || makecb || freecb) {
 			cookie = cookie_add(session, idx, key, value, freecb);
 			if (!cookie) {
 				if (makecb && freecb)