Changeset 5caad1d in mainline

Timestamp:

2025-06-20T18:59:58Z (10 hours ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

235bd1f, f0cc1c64

Parents:

cb20b05

Message:

tbarcfg_listener_destroy() should clean up properly.

Location:

uspace/lib/tbarcfg

Files:

• private/tbarcfg.h (modified) (3 diffs)
• src/tbarcfg.c (modified) (3 diffs)

uspace/lib/tbarcfg/private/tbarcfg.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -39 +39 @@
 
 #include <adt/list.h>
+#include <loc.h>
 #include <stdbool.h>
 #include <types/tbarcfg/tbarcfg.h>
@@ -68 +69 @@
 /** Taskbar configuration listener */
 typedef struct tbarcfg_listener {
+        /** Async port */
+        port_id_t portid;
+        /** Registered server */
+        loc_srv_t *srv;
+        /** Registered service */
+        service_id_t svcid;
         /** Notification callback */
         void (*cb)(void *);

uspace/lib/tbarcfg/src/tbarcfg.c

@@ -671 +671 @@
                 goto error;
 
+        free(svcname);
+        svcname = NULL;
+
         rc = loc_category_get_id(nchan, &catid, 0);
         if (rc != EOK)
@@ -679 +682 @@
                 goto error;
 
+        lst->portid = port;
+        lst->srv = srv;
+        lst->svcid = svcid;
         *rlst = lst;
         return EOK;
@@ -699 +705 @@
 void tbarcfg_listener_destroy(tbarcfg_listener_t *lst)
 {
+        loc_service_unregister(lst->srv, lst->svcid);
+        loc_server_unregister(lst->srv);
+        async_port_destroy(lst->portid);
         free(lst);
 }