auto with g_new

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/src/print.cc b/src/print.cc
index f271369..7118721 100644 (file)
--- a/src/print.cc
+++ b/src/print.cc
@@ -839,7 +839,6 @@ static void end_print_cb(GtkPrintOperation *operation,
 
 void print_window_new(FileData *UNUSED(fd), GList *selection, GList *UNUSED(list), GtkWidget *parent)
 {
-       PrintWindow *pw;
        GtkWidget *vbox;
        GtkPrintOperation *operation;
        GtkPageSetup *page_setup;
@@ -849,7 +848,7 @@ void print_window_new(FileData *UNUSED(fd), GList *selection, GList *UNUSED(list
        gchar *path;
        GtkPrintSettings *settings;
 
-       pw = g_new0(PrintWindow, 1);
+       auto pw = g_new0(PrintWindow, 1);
 
        pw->source_selection = file_data_process_groups_in_selection(selection, FALSE, nullptr);
 

diff --git a/src/rcfile.cc b/src/rcfile.cc
index dd4780c..6bb474a 100644 (file)
--- a/src/rcfile.cc
+++ b/src/rcfile.cc
@@ -1739,9 +1739,8 @@ gboolean load_config_from_buf(const gchar *buf, gsize size, gboolean startup)
 {
        GMarkupParseContext *context;
        gboolean ret = TRUE;
-       GQParserData *parser_data;
 
-       parser_data = g_new0(GQParserData, 1);
+       auto parser_data = g_new0(GQParserData, 1);
 
        parser_data->startup = startup;
        options_parse_func_push(parser_data, options_parse_toplevel, nullptr, nullptr);

diff --git a/src/renderer-tiles.cc b/src/renderer-tiles.cc
index 0c5d134..c76aeac 100644 (file)
--- a/src/renderer-tiles.cc
+++ b/src/renderer-tiles.cc
@@ -281,9 +281,7 @@ static void rt_border_clear(RendererTiles *rt)
 
 static ImageTile *rt_tile_new(gint x, gint y, gint width, gint height)
 {
-       ImageTile *it;
-
-       it = g_new0(ImageTile, 1);
+       auto it = g_new0(ImageTile, 1);
 
        it->x = x;
        it->y = y;
@@ -744,7 +742,6 @@ gint renderer_tiles_overlay_add(void *renderer, GdkPixbuf *pixbuf, gint x, gint
 {
        auto rt = static_cast<RendererTiles *>(renderer);
        PixbufRenderer *pr = rt->pr;
-       OverlayData *od;
        gint id;
 
        g_return_val_if_fail(IS_PIXBUF_RENDERER(pr), -1);
@@ -753,7 +750,7 @@ gint renderer_tiles_overlay_add(void *renderer, GdkPixbuf *pixbuf, gint x, gint
        id = 1;
        while (rt_overlay_find(rt, id)) id++;
 
-       od = g_new0(OverlayData, 1);
+       auto od = g_new0(OverlayData, 1);
        od->id = id;
        od->pixbuf = pixbuf;
        g_object_ref(G_OBJECT(od->pixbuf));
@@ -789,9 +786,7 @@ static void rt_overlay_list_clear(RendererTiles *rt)
 {
        while (rt->overlay_list)
                {
-               OverlayData *od;
-
-               od = static_cast<OverlayData *>(rt->overlay_list->data);
+               auto od = static_cast<OverlayData *>(rt->overlay_list->data);
                rt_overlay_free(rt, od);
                }
 }
@@ -1846,15 +1841,13 @@ static gboolean rt_queue_to_tiles(RendererTiles *rt, gint x, gint y, gint w, gin
                                           j > rt->y_scroll + pr->vis_height)));
                        if (it)
                                {
-                               QueueData *qd;
-
                                if ((render == TILE_RENDER_ALL && it->render_done != TILE_RENDER_ALL) ||
                                    (render == TILE_RENDER_AREA && it->render_todo != TILE_RENDER_ALL))
                                        {
                                        it->render_todo = render;
                                        }
 
-                               qd = g_new(QueueData, 1);
+                               auto qd = g_new(QueueData, 1);
                                qd->it = it;
                                qd->new_data = new_data;
 

diff --git a/src/search.cc b/src/search.cc
index 917cc24..fc7f1e2 100644 (file)
--- a/src/search.cc
+++ b/src/search.cc
@@ -2415,9 +2415,7 @@ static gboolean search_file_next(SearchData *sd)
 
        if (tested && match)
                {
-               MatchFileData *mfd;
-
-               mfd = g_new(MatchFileData, 1);
+               auto mfd = g_new(MatchFileData, 1);
                mfd->fd = fd;
 
                mfd->width = width;
@@ -3282,7 +3280,6 @@ static void select_collection_clicked_cb(GtkWidget *UNUSED(widget), gpointer dat
 
 void search_new(FileData *dir_fd, FileData *example_file)
 {
-       SearchData *sd;
        GtkWidget *vbox;
        GtkWidget *hbox;
        GtkWidget *hbox2;
@@ -3301,7 +3298,7 @@ void search_new(FileData *dir_fd, FileData *example_file)
 
        layout_valid(&lw);
 
-       sd = g_new0(SearchData, 1);
+       auto sd = g_new0(SearchData, 1);
 
        sd->search_dir_fd = file_data_ref(dir_fd);
        sd->search_path_recurse = TRUE;

diff --git a/src/view-dir-tree.cc b/src/view-dir-tree.cc
index fc74f88..c8955c3 100644 (file)
--- a/src/view-dir-tree.cc
+++ b/src/view-dir-tree.cc
@@ -376,9 +376,7 @@ static void vdtree_add_by_data(ViewDir *vd, FileData *fd, GtkTreeIter *parent)
 {
        GtkTreeStore *store;
        GtkTreeIter child;
-       NodeData *nd;
        GdkPixbuf *pixbuf;
-       NodeData *end;
        GtkTreeIter empty;
        gchar *link = nullptr;
 
@@ -404,7 +402,7 @@ static void vdtree_add_by_data(ViewDir *vd, FileData *fd, GtkTreeIter *parent)
                pixbuf = vd->pf->deny;
                }
 
-       nd = g_new0(NodeData, 1);
+       auto nd = g_new0(NodeData, 1);
        nd->fd = fd;
        nd->version = fd->version;
        nd->expanded = FALSE;
@@ -429,7 +427,7 @@ static void vdtree_add_by_data(ViewDir *vd, FileData *fd, GtkTreeIter *parent)
 
        /* all nodes are created with an "empty" node, so that the expander is shown
         * this is removed when the child is populated */
-       end = g_new0(NodeData, 1);
+       auto end = g_new0(NodeData, 1);
        end->fd = nullptr;
        end->expanded = TRUE;
 

diff --git a/src/view-file/view-file-icon.cc b/src/view-file/view-file-icon.cc
index c874cd6..dae4b9d 100644 (file)
--- a/src/view-file/view-file-icon.cc
+++ b/src/view-file/view-file-icon.cc
@@ -2172,7 +2172,6 @@ static void vficon_cell_data_cb(GtkTreeViewColumn *UNUSED(tree_column), GtkCellR
 
 static void vficon_append_column(ViewFile *vf, gint n)
 {
-       ColumnData *cd;
        GtkTreeViewColumn *column;
        GtkCellRenderer *renderer;
 
@@ -2191,7 +2190,7 @@ static void vficon_append_column(ViewFile *vf, gint n)
        g_object_set_data(G_OBJECT(column), "column_number", GINT_TO_POINTER(n));
        g_object_set_data(G_OBJECT(renderer), "column_number", GINT_TO_POINTER(n));
 
-       cd = g_new0(ColumnData, 1);
+       auto cd = g_new0(ColumnData, 1);
        cd->vf = vf;
        cd->number = n;
        gtk_tree_view_column_set_cell_data_func(column, renderer, vficon_cell_data_cb, cd, g_free);

diff --git a/src/view-file/view-file.cc b/src/view-file/view-file.cc
index 328509c..0ad233e 100644 (file)
--- a/src/view-file/view-file.cc
+++ b/src/view-file/view-file.cc
@@ -888,51 +888,48 @@ static gboolean vf_marks_tooltip_cb(GtkWidget *widget,
 {
        GtkWidget *table;
        gint i = GPOINTER_TO_INT(user_data);
-       MarksTextEntry *mte;
 
-       if (event->button == MOUSE_BUTTON_RIGHT)
-               {
-               mte = g_new0(MarksTextEntry, 1);
-               mte->mark_no = i;
-               mte->text_entry = g_strdup(options->marks_tooltips[i]);
-               mte->parent = widget;
-
-               mte->gd = generic_dialog_new(_("Mark text"), "mark_text",
-                                               widget, FALSE,
-                                               vf_marks_tooltip_cancel_cb, mte);
-               generic_dialog_add_message(mte->gd, GTK_STOCK_DIALOG_QUESTION, _("Set mark text"),
-                                           _("This will set or clear the mark text."), FALSE);
-               generic_dialog_add_button(mte->gd, GTK_STOCK_OK, nullptr,
-                                                       vf_marks_tooltip_ok_cb, TRUE);
-               generic_dialog_add_button(mte->gd, GTK_STOCK_HELP, nullptr,
-                                               vf_marks_tooltip_help_cb, FALSE);
-
-               table = pref_table_new(mte->gd->vbox, 3, 1, FALSE, TRUE);
-               pref_table_label(table, 0, 0, g_strdup_printf("%s%d", _("Mark "), mte->mark_no + 1), 1.0);
-               mte->edit_widget = gtk_entry_new();
-               gtk_widget_set_size_request(mte->edit_widget, 300, -1);
-               if (mte->text_entry)
-                       {
-                       gtk_entry_set_text(GTK_ENTRY(mte->edit_widget), mte->text_entry);
-                       }
-               gtk_table_attach_defaults(GTK_TABLE(table), mte->edit_widget, 1, 2, 0, 1);
-               generic_dialog_attach_default(mte->gd, mte->edit_widget);
+       if (event->button != MOUSE_BUTTON_RIGHT)
+               return FALSE;
 
-               gtk_entry_set_icon_from_stock(GTK_ENTRY(mte->edit_widget),
-                                                       GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
-               gtk_entry_set_icon_tooltip_text (GTK_ENTRY(mte->edit_widget),
-                                                       GTK_ENTRY_ICON_SECONDARY, "Clear");
-               g_signal_connect(GTK_ENTRY(mte->edit_widget), "icon-press",
-                                                       G_CALLBACK(vf_marks_filter_on_icon_press), mte);
+       auto mte = g_new0(MarksTextEntry, 1);
+       mte->mark_no = i;
+       mte->text_entry = g_strdup(options->marks_tooltips[i]);
+       mte->parent = widget;
+
+       mte->gd = generic_dialog_new(_("Mark text"), "mark_text",
+                                    widget, FALSE,
+                                    vf_marks_tooltip_cancel_cb, mte);
+       generic_dialog_add_message(mte->gd, GTK_STOCK_DIALOG_QUESTION, _("Set mark text"),
+                                  _("This will set or clear the mark text."), FALSE);
+       generic_dialog_add_button(mte->gd, GTK_STOCK_OK, nullptr,
+                                 vf_marks_tooltip_ok_cb, TRUE);
+       generic_dialog_add_button(mte->gd, GTK_STOCK_HELP, nullptr,
+                                 vf_marks_tooltip_help_cb, FALSE);
+
+       table = pref_table_new(mte->gd->vbox, 3, 1, FALSE, TRUE);
+       pref_table_label(table, 0, 0, g_strdup_printf("%s%d", _("Mark "), mte->mark_no + 1), 1.0);
+       mte->edit_widget = gtk_entry_new();
+       gtk_widget_set_size_request(mte->edit_widget, 300, -1);
+       if (mte->text_entry)
+               {
+               gtk_entry_set_text(GTK_ENTRY(mte->edit_widget), mte->text_entry);
+               }
+       gtk_table_attach_defaults(GTK_TABLE(table), mte->edit_widget, 1, 2, 0, 1);
+       generic_dialog_attach_default(mte->gd, mte->edit_widget);
 
-               gtk_widget_show(mte->edit_widget);
-               gtk_widget_grab_focus(mte->edit_widget);
-               gtk_widget_show(GTK_WIDGET(mte->gd->dialog));
+       gtk_entry_set_icon_from_stock(GTK_ENTRY(mte->edit_widget),
+                                     GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
+       gtk_entry_set_icon_tooltip_text(GTK_ENTRY(mte->edit_widget),
+                                       GTK_ENTRY_ICON_SECONDARY, "Clear");
+       g_signal_connect(GTK_ENTRY(mte->edit_widget), "icon-press",
+                        G_CALLBACK(vf_marks_filter_on_icon_press), mte);
 
-               return TRUE;
-               }
+       gtk_widget_show(mte->edit_widget);
+       gtk_widget_grab_focus(mte->edit_widget);
+       gtk_widget_show(GTK_WIDGET(mte->gd->dialog));
 
-       return FALSE;
+       return TRUE;
 }
 
 static void vf_file_filter_save_cb(GtkWidget *UNUSED(widget), gpointer data)

diff --git a/src/window.cc b/src/window.cc
index cc96f0a..fefdbdf 100644 (file)
--- a/src/window.cc
+++ b/src/window.cc
@@ -360,13 +360,12 @@ static void help_search_window_cancel_cb(GenericDialog *UNUSED(gd), gpointer dat
 
 void help_search_window_show()
 {
-       HelpSearchData *hsd;
        GenericDialog *gd;
        GtkWidget *table;
        GtkWidget *label1;
        GtkWidget *label2;
 
-       hsd = g_new0(HelpSearchData, 1);
+       auto hsd = g_new0(HelpSearchData, 1);
        hsd->gd = gd = generic_dialog_new(_("On-line help search"), "help_search",
                                nullptr, TRUE,
                                help_search_window_cancel_cb, hsd);

diff --git a/src/zonedetect.cc b/src/zonedetect.cc
index fe87713..151da36 100644 (file)
--- a/src/zonedetect.cc
+++ b/src/zonedetect.cc
@@ -592,20 +592,18 @@ float* ZDPolygonToList(const ZoneDetect *library, uint32_t polygonId, size_t* le
     float* flData = nullptr;
     size_t length = 0;
 
-    if(!ZDFindPolygon(library, polygonId, nullptr, &polygonIndex)) {
-        goto fail;
-    }
+    if (!ZDFindPolygon(library, polygonId, nullptr, &polygonIndex))
+           return nullptr;
 
     data = ZDPolygonToListInternal(library, polygonIndex, &length);
-
-    if(!data) {
-        goto fail;
-    }
+    if (!data)
+           return nullptr;
 
     flData = static_cast<float *>(malloc(sizeof(float) * length));
     if(!flData) {
-        goto fail;
-    }
+           free(data);
+           return nullptr;
+           }
 
     for(size_t i = 0; i<length; i+= 2) {
         int32_t lat = data[i];
@@ -620,15 +618,6 @@ float* ZDPolygonToList(const ZoneDetect *library, uint32_t polygonId, size_t* le
     }
 
     return flData;
-
-fail:
-    if(data) {
-        free(data);
-    }
-    if(flData) {
-        free(flData);
-    }
-    return nullptr;
 }
 
 static ZDLookupResult ZDPointInPolygon(const ZoneDetect *library, uint32_t polygonIndex, int32_t latFixedPoint, int32_t lonFixedPoint, uint64_t *distanceSqrMin)