Use automatic cleanup where possible

Author: sebastinas

zathura/callbacks.c

@@ -307,12 +307,11 @@ void cb_page_layout_value_changed(girara_session_t* session, const char* name, g
   girara_setting_get(session, "pages-per-row", &pages_per_row);
 
   /* get list of first_page_column settings */
-  char* first_page_column_list = NULL;
+  g_autofree char* first_page_column_list = NULL;
   girara_setting_get(session, "first-page-column", &first_page_column_list);
 
   /* find value for first_page_column */
   unsigned int first_page_column = find_first_page_column(first_page_column_list, pages_per_row);
-  g_free(first_page_column_list);
 
   unsigned int page_v_padding = 1;
   girara_setting_get(zathura->ui.session, "page-v-padding", &page_v_padding);
@@ -367,7 +366,7 @@ static gboolean handle_link(GtkEntry* entry, girara_session_t* session, zathura_
   zathura_t* zathura = session->global.data;
   gboolean eval      = TRUE;
 
-  char* input = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
+  g_autofree char* input = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
   if (input == NULL || strlen(input) == 0) {
     eval = FALSE;
   }
@@ -409,20 +408,17 @@ static gboolean handle_link(GtkEntry* entry, girara_session_t* session, zathura_
       zathura_link_display(zathura, link);
       break;
     case ZATHURA_LINK_ACTION_COPY: {
-      GdkAtom* selection = get_selection(zathura);
+      g_autofree GdkAtom* selection = get_selection(zathura);
       if (selection == NULL) {
         break;
       }
 
       zathura_link_copy(zathura, link, selection);
-      g_free(selection);
       break;
     }
     }
   }
 
-  g_free(input);
-
   return eval;
 }
 
@@ -608,7 +604,7 @@ void cb_page_widget_text_selected(ZathuraPage* page, const char* text, void* dat
     return;
   }
 
-  GdkAtom* selection = get_selection(zathura);
+  g_autofree GdkAtom* selection = get_selection(zathura);
   if (selection == NULL) {
     return;
   }
@@ -620,19 +616,15 @@ void cb_page_widget_text_selected(ZathuraPage* page, const char* text, void* dat
   girara_setting_get(zathura->ui.session, "selection-notification", &notification);
 
   if (notification == true) {
-    char* target = NULL;
+    g_autofree char* target = NULL;
     girara_setting_get(zathura->ui.session, "selection-clipboard", &target);
 
-    char* stripped_text = g_strdelimit(g_strdup(text), "\n\t\r\n", ' ');
-    char* escaped_text  = g_markup_printf_escaped(_("Copied selected text to selection %s: %s"), target, stripped_text);
-    g_free(target);
-    g_free(stripped_text);
+    g_autofree char* stripped_text = g_strdelimit(g_strdup(text), "\n\t\r\n", ' ');
+    g_autofree char* escaped_text =
+        g_markup_printf_escaped(_("Copied selected text to selection %s: %s"), target, stripped_text);
 
     girara_notify(zathura->ui.session, GIRARA_INFO, "%s", escaped_text);
-    g_free(escaped_text);
   }
-
-  g_free(selection);
 }
 
 void cb_page_widget_image_selected(ZathuraPage* page, GdkPixbuf* pixbuf, void* data) {
@@ -641,7 +633,7 @@ void cb_page_widget_image_selected(ZathuraPage* page, GdkPixbuf* pixbuf, void* d
   g_return_if_fail(data != NULL);
 
   zathura_t* zathura = data;
-  GdkAtom* selection = get_selection(zathura);
+  g_autofree GdkAtom* selection = get_selection(zathura);
 
   if (selection != NULL) {
     gtk_clipboard_set_image(gtk_clipboard_get(*selection), pixbuf);
@@ -650,16 +642,13 @@ void cb_page_widget_image_selected(ZathuraPage* page, GdkPixbuf* pixbuf, void* d
     girara_setting_get(zathura->ui.session, "selection-notification", &notification);
 
     if (notification == true) {
-      char* target = NULL;
+      g_autofree char* target = NULL;
       girara_setting_get(zathura->ui.session, "selection-clipboard", &target);
 
-      char* escaped_text = g_markup_printf_escaped(_("Copied selected image to selection %s"), target);
-      g_free(target);
+      g_autofree char* escaped_text = g_markup_printf_escaped(_("Copied selected image to selection %s"), target);
 
       girara_notify(zathura->ui.session, GIRARA_INFO, "%s", escaped_text);
     }
-
-    g_free(selection);
   }
 }
 
@@ -698,16 +687,14 @@ void cb_page_widget_scaled_button_release(ZathuraPage* page_widget, GdkEventButt
       zathura_dbus_edit(zathura, zathura_page_get_index(page), event->x, event->y);
     }
 
-    char* editor = NULL;
+    g_autofree char* editor = NULL;
     girara_setting_get(zathura->ui.session, "synctex-editor-command", &editor);
     if (editor == NULL || *editor == '\0') {
       girara_debug("No SyncTeX editor specified.");
-      g_free(editor);
       return;
     }
 
     synctex_edit(zathura, editor, page, event->x, event->y);
-    g_free(editor);
   }
 }
 

zathura/commands.c

@@ -100,7 +100,7 @@ bool cmd_bookmark_list(girara_session_t* session, girara_list_t* GIRARA_UNUSED(a
     return false;
   }
 
-  GString* string = g_string_new(NULL);
+  g_autoptr(GString) string = g_string_new(NULL);
   for (size_t idx = 0; idx != girara_list_size(zathura->bookmarks.bookmarks); ++idx) {
     zathura_bookmark_t* bookmark = girara_list_nth(zathura->bookmarks.bookmarks, idx);
     g_string_append_printf(string, "<b>%s</b>: %u\n", bookmark->id, bookmark->page);
@@ -113,7 +113,6 @@ bool cmd_bookmark_list(girara_session_t* session, girara_list_t* GIRARA_UNUSED(a
     girara_notify(session, GIRARA_INFO, _("No bookmarks available."));
   }
 
-  g_string_free(string, TRUE);
   return true;
 }
 
@@ -181,7 +180,7 @@ bool cmd_jumplist_list(girara_session_t* session, girara_list_t* argument_list)
   }
 
   zathura_jump_t* current_jump = zathura_jumplist_current(zathura);
-  GString* string              = g_string_new(NULL);
+  g_autoptr(GString) string    = g_string_new(NULL);
   for (int i = zathura->jumplist.size - 1; i >= 0 && num_entries > 0; --i, --num_entries) {
     const zathura_jump_t* j = girara_list_nth(zathura->jumplist.list, i);
     g_string_append_printf(string, _("[%d]: page=<b>%2d</b>, x=%f, y=%f %s\n"), i, j->page + 1, j->x, j->y,
@@ -195,7 +194,6 @@ bool cmd_jumplist_list(girara_session_t* session, girara_list_t* argument_list)
     girara_notify(session, GIRARA_INFO, _("No jumplist available."));
   }
 
-  g_string_free(string, TRUE);
   return true;
 }
 
@@ -245,8 +243,7 @@ bool cmd_info(girara_session_t* session, girara_list_t* UNUSED(argument_list)) {
     return false;
   }
 
-  GString* string = g_string_new(NULL);
-
+  g_autoptr(GString) string = g_string_new(NULL);
   for (size_t i = 0; i < LENGTH(meta_fields); i++) {
     for (size_t idx = 0; idx != girara_list_size(information); ++idx) {
       zathura_document_information_entry_t* entry = girara_list_nth(information, idx);
@@ -263,8 +260,6 @@ bool cmd_info(girara_session_t* session, girara_list_t* UNUSED(argument_list)) {
     girara_notify(session, GIRARA_INFO, _("No information available."));
   }
 
-  g_string_free(string, TRUE);
-
   return false;
 }
 
@@ -604,12 +599,10 @@ bool cmd_exec(girara_session_t* session, girara_list_t* argument_list) {
     g_ascii_dtostr(page_buf, G_ASCII_DTOSTR_BUF_SIZE, page + 1);
 
     for (size_t idx = 0; idx != girara_list_size(argument_list); ++idx) {
-      char* value = girara_list_nth(argument_list, idx);
-      char* r     = girara_replace_substring(value, "$PAGE", page_buf);
+      char* value        = girara_list_nth(argument_list, idx);
+      g_autofree char* r = girara_replace_substring(value, "$PAGE", page_buf);
       if (r != NULL) {
         char* s = girara_replace_substring(r, "$FILE", path);
-        g_free(r);
-
         if (s != NULL) {
           girara_list_set_nth(argument_list, idx, s);
         }
@@ -656,16 +649,13 @@ bool cmd_version(girara_session_t* session, girara_list_t* UNUSED(argument_list)
   g_return_val_if_fail(session->global.data != NULL, false);
   zathura_t* zathura = session->global.data;
 
-  char* string = zathura_get_version_string(zathura->plugins.manager, true);
+  g_autofree char* string = zathura_get_version_string(zathura->plugins.manager, true);
   if (string == NULL) {
     return false;
   }
 
   /* display information */
   girara_notify(session, GIRARA_INFO, "%s", string);
-
-  g_free(string);
-
   return true;
 }
 

zathura/completion.c

@@ -24,12 +24,9 @@ static int compare_case_insensitive(const void* data1, const void* data2) {
   const char* str1 = data1;
   const char* str2 = data2;
 
-  char* ustr1 = g_utf8_casefold(str1, -1);
-  char* ustr2 = g_utf8_casefold(str2, -1);
-  int res     = g_utf8_collate(ustr1, ustr2);
-  g_free(ustr1);
-  g_free(ustr2);
-  return res;
+  g_autofree char* ustr1 = g_utf8_casefold(str1, -1);
+  g_autofree char* ustr2 = g_utf8_casefold(str2, -1);
+  return g_utf8_collate(ustr1, ustr2);
 }
 
 static girara_list_t* list_files(zathura_t* zathura, const char* current_path, const char* current_file,
@@ -41,7 +38,7 @@ static girara_list_t* list_files(zathura_t* zathura, const char* current_path, c
   girara_debug("checking files in %s", current_path);
 
   /* read directory */
-  GDir* dir = g_dir_open(current_path, 0, NULL);
+  g_autoptr(GDir) dir = g_dir_open(current_path, 0, NULL);
   if (dir == NULL) {
     return NULL;
   }
@@ -56,20 +53,18 @@ static girara_list_t* list_files(zathura_t* zathura, const char* current_path, c
   /* read files */
   const char* name = NULL;
   while ((name = g_dir_read_name(dir)) != NULL) {
-    char* e_name = g_filename_display_name(name);
+    g_autofree char* e_name = g_filename_display_name(name);
     if (e_name == NULL) {
       goto error_free;
     }
 
     size_t e_length = strlen(e_name);
 
     if (show_hidden == false && e_name[0] == '.') {
-      g_free(e_name);
       continue;
     }
 
     if ((current_file_length > e_length) || strncmp(current_file, e_name, current_file_length)) {
-      g_free(e_name);
       continue;
     }
 
@@ -79,7 +74,6 @@ static girara_list_t* list_files(zathura_t* zathura, const char* current_path, c
     }
 
     char* full_path = g_strdup_printf("%s%s%s", current_path, tmp, e_name);
-    g_free(e_name);
 
     if (g_file_test(full_path, G_FILE_TEST_IS_DIR) == true) {
       if (show_directories == false) {
@@ -98,8 +92,6 @@ static girara_list_t* list_files(zathura_t* zathura, const char* current_path, c
     }
   }
 
-  g_dir_close(dir);
-
   if (girara_list_size(res) == 1) {
     char* path = girara_list_nth(res, 0);
     if (g_file_test(path, G_FILE_TEST_IS_DIR) == true) {
@@ -113,7 +105,6 @@ static girara_list_t* list_files(zathura_t* zathura, const char* current_path, c
   return res;
 
 error_free:
-  g_dir_close(dir);
   girara_list_free(res);
   return NULL;
 }

zathura/config.c

@@ -42,9 +42,8 @@ static void cb_color(girara_session_t* session, const char* name, girara_setting
   GdkRGBA color = {0, 0, 0, 0};
   gdk_rgba_parse(&color, str_value);
 
-  char* colorstr = gdk_rgba_to_string(&color);
+  g_autofree char* colorstr = gdk_rgba_to_string(&color);
   girara_template_set_variable_value(csstemplate, name, colorstr);
-  g_free(colorstr);
 }
 
 
@@ -157,9 +156,8 @@ static void cb_window_statbusbar_changed(girara_session_t* session, const char*
 
   const bool is_window_setting = g_str_has_prefix(name, "window-");
   if (is_window_setting) {
-    char* formatted_filename = get_formatted_filename(zathura, !is_window_setting);
+    g_autofree char* formatted_filename = get_formatted_filename(zathura, !is_window_setting);
     girara_set_window_title(zathura->ui.session, formatted_filename);
-    g_free(formatted_filename);
   } else {
     statusbar_page_number_update(zathura);
   }
@@ -711,24 +709,21 @@ void config_load_default(zathura_t* zathura) {
 
 void config_load_files(zathura_t* zathura) {
   /* load global configuration files */
-  char* config_path          = girara_get_xdg_path(XDG_CONFIG_DIRS);
+  g_autofree char* config_path          = girara_get_xdg_path(XDG_CONFIG_DIRS);
   if (config_path != NULL && config_path[0] != '\0') {
     char** config_dirs = g_strsplit(config_path, ":", 0);
     ssize_t size       = g_strv_length(config_dirs) - 1;
     for (; size >= 0; --size) {
-      const char* dir = config_dirs[size];
-      char* file      = g_build_filename(dir, ZATHURA_RC, NULL);
+      const char* dir       = config_dirs[size];
+      g_autofree char* file = g_build_filename(dir, ZATHURA_RC, NULL);
       girara_config_parse(zathura->ui.session, file);
-      g_free(file);
     }
     g_strfreev(config_dirs);
-    g_free(config_path);
   }
 
   girara_config_parse(zathura->ui.session, SYSCONFDIR "/" ZATHURA_RC);
 
   /* load local configuration files */
-  char* configuration_file = g_build_filename(zathura->config.config_dir, ZATHURA_RC, NULL);
+  g_autofree char* configuration_file = g_build_filename(zathura->config.config_dir, ZATHURA_RC, NULL);
   girara_config_parse(zathura->ui.session, configuration_file);
-  g_free(configuration_file);
 }