Changeset 8a43f01 in mainline

Timestamp:

2023-11-25T19:02:24Z (5 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, topic/simplify-dev-export

Children:

84d29a2

Parents:

69935a8

Message:

tbarcfg_close() should clean up

Location:

uspace/lib/tbarcfg

Files:

• private/tbarcfg.h (modified) (1 diff)
• src/tbarcfg.c (modified) (5 diffs)

uspace/lib/tbarcfg/private/tbarcfg.h

@@ -64 +64 @@
 };
 
-extern errno_t smenu_entry_create(tbarcfg_t *, sif_node_t *, const char *,
+extern errno_t smenu_entry_new(tbarcfg_t *, sif_node_t *, const char *,
     const char *);
+extern void smenu_entry_delete(smenu_entry_t *);
 
 #endif

uspace/lib/tbarcfg/src/tbarcfg.c

@@ -101 +101 @@
                 }
 
-                rc = smenu_entry_create(tbcfg, nentry, caption, cmd);
+                rc = smenu_entry_new(tbcfg, nentry, caption, cmd);
                 if (rc != EOK)
                         goto error;
@@ -124 +124 @@
 void tbarcfg_close(tbarcfg_t *tbcfg)
 {
+        smenu_entry_t *entry;
+
+        entry = tbarcfg_smenu_first(tbcfg);
+        while (entry != NULL) {
+                smenu_entry_delete(entry);
+                entry = tbarcfg_smenu_first(tbcfg);
+        }
+
         (void)sif_close(tbcfg->repo);
+        free(tbcfg);
 }
 
@@ -255 +264 @@
 }
 
-/** Create a start menu entry and append it to the start menu (internal).
+/** Allocate a start menu entry and append it to the start menu (internal).
  *
  * This only creates the entry in memory, but does not update the repository.
@@ -264 +273 @@
  * @param cmd Command to run
  */
-errno_t smenu_entry_create(tbarcfg_t *smenu, sif_node_t *nentry,
+errno_t smenu_entry_new(tbarcfg_t *smenu, sif_node_t *nentry,
     const char *caption, const char *cmd)
 {
@@ -305 +314 @@
 }
 
+/** Delete start menu entry.
+ *
+ * This only deletes the entry from, but does not update the
+ * repository.
+ *
+ * @param entry Start menu entry
+ */
+void smenu_entry_delete(smenu_entry_t *entry)
+{
+        list_remove(&entry->lentries);
+        free(entry->caption);
+        free(entry->cmd);
+        free(entry);
+}
+
 /** @}
  */