added functions to free objects

TinyTrebuchet · TinyTrebuchet · commit a86d7e1549ff · 2022-12-19T17:26:25.000+05:30
diff --git a/configure.ac b/configure.ac
@@ -29,9 +29,7 @@ AC_TYPE_SIZE_T
  
 # Checks for library functions.
 AC_FUNC_MALLOC
-AC_CHECK_FUNCS([access
-                getcwd
-                mkdir])
+AC_CHECK_FUNCS([access getcwd mkdir])
 
 # The info directory which will be read by the frontend
 CPDB_BACKEND_INFO_DIR="$datadir/print-backends"
diff --git a/cpdb/cpdb-frontend.c b/cpdb/cpdb-frontend.c
@@ -23,13 +23,40 @@ cpdb_frontend_obj_t *cpdbGetNewFrontendObj(char *instance_name,
     f->add_cb = add_cb;
     f->rem_cb = rem_cb;
     f->num_backends = 0;
-    f->backend = g_hash_table_new(g_str_hash, g_str_equal);
+    f->backend = g_hash_table_new_full(g_str_hash,
+                                       g_str_equal,
+                                       free,
+                                       g_object_unref);
     f->num_printers = 0;
-    f->printer = g_hash_table_new(g_str_hash, g_str_equal);
+    f->printer = g_hash_table_new_full(g_str_hash,
+                                       g_str_equal,
+                                       free,
+                                       (GDestroyNotify) cpdbDeletePrinterObj);
     f->last_saved_settings = cpdbReadSettingsFromDisk();
     return f;
 }
 
+void cpdbDeleteFrontendObj(cpdb_frontend_obj_t *f)
+{
+    if (f == NULL)
+        return;
+    
+    cpdbDisconnectFromDBus(f);
+
+    if (f->skeleton)
+        g_object_unref(f->skeleton);
+    if (f->bus_name)
+        free(f->bus_name);
+    if (f->backend)
+        g_hash_table_destroy(f->backend);
+    if (f->printer)
+        g_hash_table_destroy(f->printer);
+    if (f->last_saved_settings)
+        cpdbDeleteSettings(f->last_saved_settings);
+    
+    free(f);
+}
+
 static void on_printer_added(GDBusConnection *connection,
                              const gchar *sender_name,
                              const gchar *object_path,
@@ -169,6 +196,9 @@ void cpdbConnectToDBus(cpdb_frontend_obj_t *f)
 
 void cpdbDisconnectFromDBus(cpdb_frontend_obj_t *f)
 {
+    if (f->connection == NULL || g_dbus_connection_is_closed(f->connection))
+        return;
+    
     print_frontend_emit_stop_listing(f->skeleton);
     g_dbus_connection_flush_sync(f->connection, NULL, NULL);
     
@@ -272,6 +302,7 @@ gboolean cpdbAddPrinter(cpdb_frontend_obj_t *f,
                       CPDB_DEBUG_LEVEL_ERR);
         return FALSE;
     }
+    g_object_ref(p->backend_proxy);
 
     g_hash_table_insert(f->printer, cpdbConcatSep(p->id, p->backend_name), p);
     f->num_printers++;
@@ -298,20 +329,17 @@ cpdb_printer_obj_t *cpdbRemovePrinter(cpdb_frontend_obj_t *f,
     return p;
 }
 
-void
-cpdbRefreshPrinterList(cpdb_frontend_obj_t *f)
+void cpdbRefreshPrinterList(cpdb_frontend_obj_t *f)
 {
     print_frontend_emit_refresh_backend(f->skeleton);
 }
 
-void
-cpdbHideRemotePrinters(cpdb_frontend_obj_t *f)
+void cpdbHideRemotePrinters(cpdb_frontend_obj_t *f)
 {
     print_frontend_emit_hide_remote_printers(f->skeleton);
 }
 
-void
-cpdbUnhideRemotePrinters(cpdb_frontend_obj_t *f)
+void cpdbUnhideRemotePrinters(cpdb_frontend_obj_t *f)
 {
     print_frontend_emit_unhide_remote_printers(f->skeleton);
 }
@@ -659,6 +687,24 @@ cpdb_printer_obj_t *cpdbGetNewPrinterObj()
     return p;
 }
 
+void cpdbDeletePrinterObj(cpdb_printer_obj_t *p)
+{
+    if (p == NULL)
+        return;
+    
+    if (p->backend_name)
+        free(p->backend_name);
+    if (p->backend_proxy)
+        g_object_unref(p->backend_proxy);
+    if (p->options)
+        cpdbDeleteOptions(p->options);
+
+    if (p->settings)
+        cpdbDeleteSettings(p->settings);
+    
+    free(p);
+}
+
 void cpdbFillBasicOptions(cpdb_printer_obj_t *p,
                           GVariant *gv)
 {
@@ -1277,7 +1323,7 @@ cpdb_settings_t *cpdbGetNewSettings()
 {
     cpdb_settings_t *s = g_new0(cpdb_settings_t, 1);
     s->count = 0;
-    s->table = g_hash_table_new(g_str_hash, g_str_equal);
+    s->table = g_hash_table_new_full(g_str_hash, g_str_equal, free, free);
     return s;
 }
 
@@ -1464,12 +1510,13 @@ cpdb_settings_t *cpdbReadSettingsFromDisk()
 
 void cpdbDeleteSettings(cpdb_settings_t *s)
 {
-    if (s)
-    {
-        GHashTable *h = s->table;
-        free(s);
-        g_hash_table_destroy(h);
-    }
+    if (s == NULL)
+        return;
+    
+    if (s->table)
+        g_hash_table_destroy(s->table);
+    
+    free(s);
 }
 /**
 ________________________________________________ cpdb_options_t __________________________________________
@@ -1478,11 +1525,30 @@ cpdb_options_t *cpdbGetNewOptions()
 {
     cpdb_options_t *o = g_new0(cpdb_options_t, 1);
     o->count = 0;
-    o->table = g_hash_table_new(g_str_hash, g_str_equal);
-    o->media = g_hash_table_new(g_str_hash, g_str_equal);
+    o->table = g_hash_table_new_full(g_str_hash,
+                                     g_str_equal,
+                                     NULL,
+                                     (GDestroyNotify) cpdbDeleteOption);
+    o->media = g_hash_table_new_full(g_str_hash,
+                                     g_str_equal,
+                                     NULL,
+                                     (GDestroyNotify) cpdbDeleteMedia);
     return o;
 }
 
+void cpdbDeleteOptions(cpdb_options_t *opts)
+{
+    if (opts == NULL)
+        return;
+    
+    if (opts->table)
+        g_hash_table_destroy(opts->table);
+    if (opts->media)
+        g_hash_table_destroy(opts->media);
+
+    free(opts);
+}
+
 /**************cpdb_option_t************************************/
 void cpdbPrintOption(const cpdb_option_t *opt)
 {
@@ -1496,6 +1562,53 @@ void cpdbPrintOption(const cpdb_option_t *opt)
     printf(" --> DEFAULT: %s\n\n", opt->default_value);
 }
 
+void cpdbDeleteOption(cpdb_option_t *opt)
+{
+    if (opt == NULL)
+        return;
+    
+    if (opt->option_name)
+        free(opt->option_name);
+    if (opt->supported_values)
+        free(opt->supported_values);
+    if (opt->default_value)
+        free(opt->default_value);
+
+    free(opt);
+}
+
+/**************cpdb_option_t************************************/
+void cpdbPrintMedia(cpdb_media_t *media)
+{
+    printf("[+] Media: %s\n", media->name);
+    printf("   * width = %d\n", media->width);
+    printf("   * length = %d\n", media->length);
+    printf(" --> Supported margins: %d\n", media->num_margins);
+    printf("       left, right, top, bottom\n");
+    for (int i = 0; i < media->num_margins; i++)
+    {
+        printf("     * %d, %d, %d, %d,\n",
+               media->margins[i].left,
+               media->margins[i].right,
+               media->margins[i].top,
+               media->margins[i].bottom);
+    }
+    printf("\n");
+}
+
+void cpdbDeleteMedia(cpdb_media_t *media)
+{
+    if (media == NULL)
+        return;
+    
+    if (media->name)
+        free(media->name);
+    if (media->margins)
+        free(media->margins);
+    
+    free(media);
+}
+
 /**
  * ________________________________ cpdb_job_t __________________________
  */
diff --git a/cpdb/cpdb-frontend.h b/cpdb/cpdb-frontend.h
@@ -91,6 +91,7 @@ struct cpdb_frontend_obj_s
  *
  */
 cpdb_frontend_obj_t *cpdbGetNewFrontendObj(char *instance_name, cpdb_event_callback add_cb, cpdb_event_callback remove_cb);
+void cpdbDeleteFrontendObj(cpdb_frontend_obj_t *f);
 
 /**
  * Start the frontend D-Bus Service
@@ -259,6 +260,11 @@ struct cpdb_printer_obj_s
 
 cpdb_printer_obj_t *cpdbGetNewPrinterObj();
 
+/**
+ * Frees up memory
+ */
+void cpdbDeletePrinterObj(cpdb_printer_obj_t *p);
+
 /**
  * Fill the basic options of cpdb_printer_obj_t from the GVariant returned with the printerAdded signal
  */
@@ -268,6 +274,7 @@ void cpdbFillBasicOptions(cpdb_printer_obj_t *, GVariant *);
  * Print the basic options of cpdb_printer_obj_t
  */
 void cpdbPrintBasicOptions(cpdb_printer_obj_t *);
+
 gboolean cpdbIsAcceptingJobs(cpdb_printer_obj_t *);
 char *cpdbGetState(cpdb_printer_obj_t *);
 
@@ -509,6 +516,9 @@ void cpdbSaveSettingsToDisk(cpdb_settings_t *s);
  */
 cpdb_settings_t *cpdbReadSettingsFromDisk();
 
+/**
+ * Frees up memory
+ */
 void cpdbDeleteSettings(cpdb_settings_t *);
 
 /************************************************************************************************/
@@ -529,20 +539,27 @@ struct cpdb_options_s
  */
 cpdb_options_t *cpdbGetNewOptions();
 
+/**
+ * Frees up memory 
+ */
+void cpdbDeleteOptions(cpdb_options_t *);
+
 /************************************************************************************************/
 /**
 ______________________________________ cpdb_option_t __________________________________________
 
 **/
 struct cpdb_option_s
 {
-    const char *option_name;
+    char *option_name;
     int num_supported;
     char **supported_values;
     char *default_value;
 };
 void cpdbPrintOption(const cpdb_option_t *opt);
 
+void cpdbDeleteOption(cpdb_option_t *);
+
 /************************************************************************************************/
 
 /**
@@ -566,13 +583,16 @@ ______________________________________ cpdb_media_t ____________________________
 
 struct cpdb_media_s
 {
-    const char *name;
+    char *name;
     int width;
     int length;
     int num_margins;
     cpdb_margin_t *margins;
 };
 
+void cpdbPrintMedia(cpdb_media_t *);
+void cpdbDeleteMedia(cpdb_media_t *);
+
 /************************************************************************************************/
 /**
 ______________________________________ cpdb_job_t __________________________________________
diff --git a/demo/print_frontend.c b/demo/print_frontend.c
@@ -18,6 +18,7 @@ static int add_printer_callback(cpdb_printer_obj_t *p)
 static int remove_printer_callback(cpdb_printer_obj_t *p)
 {
     g_message("Removed Printer %s : %s!\n", p->name, p->backend_name);
+    cpdbDeletePrinterObj(p);
 }
 
 static void acquire_details_callback(cpdb_printer_obj_t *p, int success, void *user_data)
@@ -58,7 +59,7 @@ gpointer parse_commands(gpointer user_data)
         scanf("%s", buf);
         if (strcmp(buf, "stop") == 0)
         {
-            cpdbDisconnectFromDBus(f);
+            cpdbDeleteFrontendObj(f);
             g_message("Stopping front end..\n");
             exit(0);
         }
@@ -115,6 +116,29 @@ gpointer parse_commands(gpointer user_data)
                 cpdbPrintOption(value);
             }
         }
+        else if (strcmp(buf, "get-all-media") == 0)
+        {
+            char printer_id[100];
+            char backend_name[100];
+            scanf("%s%s", printer_id, backend_name);
+            g_message("Getting all attributes ..\n");
+            cpdb_printer_obj_t *p = cpdbFindPrinterObj(f, printer_id, backend_name);
+
+            if(p == NULL)
+              continue;
+
+            cpdb_options_t *opts = cpdbGetAllOptions(p);
+
+            printf("Retrieved %d medias.\n", opts->media_count);
+            GHashTableIter iter;
+            gpointer value;
+
+            g_hash_table_iter_init(&iter, opts->media);
+            while (g_hash_table_iter_next(&iter, NULL, &value))
+            {
+                cpdbPrintMedia(value);
+            }
+        }
         else if (strcmp(buf, "get-default") == 0)
         {
             char printer_id[100], backend_name[100], option_name[100];
