Skip to content

Elimination of compile warnings #3617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −20
Open

Elimination of compile warnings #3617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 3 additions & 11 deletions libnemo-private/nemo-action.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1431,11 +1431,7 @@ get_insertion_string (NemoAction *action,
break;
}

gchar *ret = str->str;

g_string_free (str, FALSE);

return ret;
return g_string_free (str, FALSE);
}

static GString *
Expand Down Expand Up @@ -1591,9 +1587,7 @@ get_final_label (NemoAction *action,

DEBUG ("Action Label: %s", str->str);

gchar *ret = str->str;
g_string_free (str, FALSE);
return ret;
return g_string_free (str, FALSE);
}

static gchar *
Expand All @@ -1616,9 +1610,7 @@ get_final_tt (NemoAction *action,

DEBUG ("Action Tooltip: %s", str->str);

gchar *ret = str->str;
g_string_free (str, FALSE);
return ret;
return g_string_free (str, FALSE);
}

static void
Expand Down
4 changes: 2 additions & 2 deletions libnemo-private/nemo-search-engine-advanced.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -770,9 +770,9 @@ load_contents (SearchThreadData *data,
break;
}

if (chunk != NULL) {
//if (chunk != NULL) {
g_string_append_len (str, chunk, len);
}
//}
Copy link
Member

@mtwebster mtwebster Nov 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just delete the lines and unindent please, don't comment.

} while (!g_cancellable_is_cancelled (data->cancellable));

g_input_stream_close (stream,
Expand Down
2 changes: 1 addition & 1 deletion search-helpers/nemo-mso-to-txt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ process_file (GString *collective,

gsf_input_read (GSF_INPUT (file), size, chunk);

if (chunk != NULL)
// if (chunk != NULL) always true
{
Copy link
Member

@mtwebster mtwebster Nov 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

remaining -= size;
contents = g_string_append_len (contents, (const gchar *) chunk, size);
Expand Down
9 changes: 8 additions & 1 deletion src/nemo-places-sidebar.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4399,6 +4399,9 @@ nemo_places_sidebar_dispose (GObject *object)
g_free (sidebar->uri);
sidebar->uri = NULL;

g_clear_object (&sidebar->ui_manager);
sidebar->ui_manager = NULL;
Copy link
Member

@mtwebster mtwebster Nov 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no need to set to NULL, g_clear_object already does this for you.

Copy link
Author

@kdmenk kdmenk Nov 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's correct

Copy link
Member

@mtwebster mtwebster Nov 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sidebar->ui_manager = NULL is redundant. This is what g_clear_object does, as opposed to g_object_unref, which does not:

image


free_drag_data (sidebar);

g_clear_handle_id (&sidebar->actions_changed_idle_id, g_source_remove);
Expand Down Expand Up @@ -4437,11 +4440,15 @@ nemo_places_sidebar_dispose (GObject *object)
breakpoint_changed_cb,
sidebar);

g_signal_handlers_disconnect_by_func (nemo_preferences,
reset_menu,
sidebar);

g_signal_handlers_disconnect_by_func (nemo_preferences,
desktop_setting_changed_callback,
sidebar);

g_signal_handlers_disconnect_by_func (gnome_background_preferences,
g_signal_handlers_disconnect_by_func (nemo_desktop_preferences,
desktop_setting_changed_callback,
sidebar);

Expand Down
6 changes: 1 addition & 5 deletions src/nemo-properties-window.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4719,7 +4719,6 @@ get_pending_key (GList *file_list)
GList *l;
GList *uris;
GString *key;
char *ret;

uris = NULL;
for (l = file_list; l != NULL; l = l->next) {
Expand All @@ -4735,10 +4734,7 @@ get_pending_key (GList *file_list)

g_list_free_full (uris, g_free);

ret = key->str;
g_string_free (key, FALSE);

return ret;
return g_string_free (key, FALSE);
}

static StartupData *
Expand Down