[nautilus] general: initialize smart pointers to NULL



commit 18915442e63a99022fd2a0d39f1f0c4edbbdd8c7
Author: Razvan Chitu <razvan ch95 gmail com>
Date:   Tue Aug 30 20:16:35 2016 +0300

    general: initialize smart pointers to NULL
    
    https://bugzilla.gnome.org/show_bug.cgi?id=770609

 nautilus-desktop/nautilus-desktop-directory.c |    2 +-
 src/nautilus-batch-rename-dialog.c            |    4 ++--
 src/nautilus-batch-rename-utilities.c         |    4 ++--
 src/nautilus-compress-dialog-controller.c     |    4 ++--
 src/nautilus-directory.c                      |    2 +-
 src/nautilus-file-name-widget-controller.c    |    2 +-
 src/nautilus-file-operations.c                |   18 +++++++++---------
 src/nautilus-file-undo-operations.c           |    8 ++++----
 src/nautilus-file-utilities.c                 |    2 +-
 src/nautilus-file.c                           |    2 +-
 src/nautilus-files-view.c                     |   19 ++++++++++---------
 src/nautilus-new-folder-dialog-controller.c   |    2 +-
 src/nautilus-operations-ui-manager.c          |    8 ++++----
 src/nautilus-properties-window.c              |    4 ++--
 src/nautilus-query-editor.c                   |    4 ++--
 src/nautilus-rename-file-popover-controller.c |    4 ++--
 src/nautilus-search-directory.c               |    2 +-
 17 files changed, 46 insertions(+), 45 deletions(-)
---
diff --git a/nautilus-desktop/nautilus-desktop-directory.c b/nautilus-desktop/nautilus-desktop-directory.c
index cfa125e..4f8de90 100644
--- a/nautilus-desktop/nautilus-desktop-directory.c
+++ b/nautilus-desktop/nautilus-desktop-directory.c
@@ -533,7 +533,7 @@ real_new_file_from_filename (NautilusDirectory *directory,
 static gboolean
 real_handles_location (GFile *location)
 {
-    g_autofree gchar *uri;
+    g_autofree gchar *uri = NULL;
 
     uri = g_file_get_uri (location);
 
diff --git a/src/nautilus-batch-rename-dialog.c b/src/nautilus-batch-rename-dialog.c
index d98e497..798a069 100644
--- a/src/nautilus-batch-rename-dialog.c
+++ b/src/nautilus-batch-rename-dialog.c
@@ -767,8 +767,8 @@ batch_rename_dialog_get_new_names (NautilusBatchRenameDialog *dialog)
     GList *result = NULL;
     GList *selection;
     GList *text_chunks;
-    g_autofree gchar *entry_text;
-    g_autofree gchar *replace_text;
+    g_autofree gchar *entry_text = NULL;
+    g_autofree gchar *replace_text = NULL;
 
     selection = dialog->selection;
     text_chunks = NULL;
diff --git a/src/nautilus-batch-rename-utilities.c b/src/nautilus-batch-rename-utilities.c
index 419037b..ca93e9b 100644
--- a/src/nautilus-batch-rename-utilities.c
+++ b/src/nautilus-batch-rename-utilities.c
@@ -280,8 +280,8 @@ batch_rename_format (NautilusFile *file,
     GString *tag;
     GString *new_name;
     gboolean added_tag;
-    g_autofree gchar *file_name;
-    g_autofree gchar *extension;
+    g_autofree gchar *file_name = NULL;
+    g_autofree gchar *extension = NULL;
     gchar *metadata;
     gchar *base_name;
 
diff --git a/src/nautilus-compress-dialog-controller.c b/src/nautilus-compress-dialog-controller.c
index 284b05a..b9cb834 100644
--- a/src/nautilus-compress-dialog-controller.c
+++ b/src/nautilus-compress-dialog-controller.c
@@ -59,7 +59,7 @@ static gchar *
 nautilus_compress_dialog_controller_get_new_name (NautilusFileNameWidgetController *controller)
 {
     NautilusCompressDialogController *self;
-    g_autofree gchar *basename;
+    g_autofree gchar *basename = NULL;
     gchar *error_message = NULL;
     gboolean valid_name;
 
@@ -206,7 +206,7 @@ nautilus_compress_dialog_controller_new (GtkWindow         *parent_window,
                                          gchar             *initial_name)
 {
     NautilusCompressDialogController *self;
-    g_autoptr (GtkBuilder) builder;
+    g_autoptr (GtkBuilder) builder = NULL;
     GtkWidget *compress_dialog;
     GtkWidget *error_revealer;
     GtkWidget *error_label;
diff --git a/src/nautilus-directory.c b/src/nautilus-directory.c
index 8e66ff0..268c463 100644
--- a/src/nautilus-directory.c
+++ b/src/nautilus-directory.c
@@ -1972,7 +1972,7 @@ nautilus_directory_number_outstanding (void)
 void
 nautilus_directory_dump (NautilusDirectory *directory)
 {
-    g_autofree gchar *uri;
+    g_autofree gchar *uri = NULL;
 
     uri = g_file_get_uri (directory->details->location);
     g_print ("uri: %s\n", uri);
diff --git a/src/nautilus-file-name-widget-controller.c b/src/nautilus-file-name-widget-controller.c
index 7b2f21d..45135be 100644
--- a/src/nautilus-file-name-widget-controller.c
+++ b/src/nautilus-file-name-widget-controller.c
@@ -136,7 +136,7 @@ file_name_widget_controller_process_new_name (NautilusFileNameWidgetController *
                                               gboolean                         *valid_name)
 {
     NautilusFileNameWidgetControllerPrivate *priv;
-    g_autofree gchar *name;
+    g_autofree gchar *name = NULL;
     gchar *error_message = NULL;
     NautilusFile *existing_file;
     priv = nautilus_file_name_widget_controller_get_instance_private (controller);
diff --git a/src/nautilus-file-operations.c b/src/nautilus-file-operations.c
index 0dd84b4..1a3bdc7 100644
--- a/src/nautilus-file-operations.c
+++ b/src/nautilus-file-operations.c
@@ -1895,7 +1895,7 @@ delete_file_recursively (GFile          *file,
 
             while (info != NULL)
             {
-                g_autoptr (GFile) child;
+                g_autoptr (GFile) child = NULL;
 
                 child = g_file_enumerator_get_child (enumerator, info);
 
@@ -8137,7 +8137,7 @@ extract_job_on_decide_destination (AutoarExtractor *extractor,
 {
     ExtractJob *extract_job = user_data;
     GFile *decided_destination;
-    g_autofree char *basename;
+    g_autofree char *basename = NULL;
 
     nautilus_progress_info_set_details (extract_job->common.progress,
                                         _("Verifying destination"));
@@ -8348,7 +8348,7 @@ extract_task_thread_func (GTask        *task,
     GList *l;
     GList *existing_output_files = NULL;
     gint total_files;
-    g_autofree guint64 *archive_compressed_sizes;
+    g_autofree guint64 *archive_compressed_sizes = NULL;
     gint i;
 
     g_timer_start (extract_job->common.time);
@@ -8368,7 +8368,7 @@ extract_task_thread_func (GTask        *task,
          l = l->next, i++)
     {
         GFile *source_file;
-        g_autoptr (GFileInfo) info;
+        g_autoptr (GFileInfo) info = NULL;
 
         source_file = G_FILE (l->data);
         info = g_file_query_info (source_file,
@@ -8390,7 +8390,7 @@ extract_task_thread_func (GTask        *task,
          l != NULL && !job_aborted ((CommonJob *) extract_job);
          l = l->next, i++)
     {
-        g_autoptr (AutoarExtractor) extractor;
+        g_autoptr (AutoarExtractor) extractor = NULL;
 
         extractor = autoar_extractor_new (G_FILE (l->data),
                                           extract_job->destination_directory);
@@ -8472,7 +8472,7 @@ nautilus_file_operations_extract_files (GList                   *files,
                                         gpointer                 done_callback_data)
 {
     ExtractJob *extract_job;
-    g_autoptr (GTask) task;
+    g_autoptr (GTask) task = NULL;
 
     extract_job = op_job_new (ExtractJob, parent_window);
     extract_job->source_files = g_list_copy_deep (files,
@@ -8696,7 +8696,7 @@ compress_job_on_completed (AutoarCompressor *compressor,
                            gpointer          user_data)
 {
     CompressJob *compress_job = user_data;
-    g_autoptr (GFile) destination_directory;
+    g_autoptr (GFile) destination_directory = NULL;
     char *status;
 
     if (compress_job->total_files == 1)
@@ -8732,7 +8732,7 @@ compress_task_thread_func (GTask        *task,
 {
     CompressJob *compress_job = task_data;
     SourceInfo source_info;
-    g_autoptr (AutoarCompressor) compressor;
+    g_autoptr (AutoarCompressor) compressor = NULL;
 
     g_timer_start (compress_job->common.time);
 
@@ -8785,7 +8785,7 @@ nautilus_file_operations_compress (GList                  *files,
                                    NautilusCreateCallback  done_callback,
                                    gpointer                done_callback_data)
 {
-    g_autoptr (GTask) task;
+    g_autoptr (GTask) task = NULL;
     CompressJob *compress_job;
 
     compress_job = op_job_new (CompressJob, parent_window);
diff --git a/src/nautilus-file-undo-operations.c b/src/nautilus-file-undo-operations.c
index 5ca65e7..e94ccfa 100644
--- a/src/nautilus-file-undo-operations.c
+++ b/src/nautilus-file-undo-operations.c
@@ -2156,7 +2156,7 @@ extract_strings_func (NautilusFileUndoInfo  *info,
     if (total_outputs == 1)
     {
         GFile *output;
-        g_autofree gchar *name;
+        g_autofree gchar *name = NULL;
 
         output = self->priv->outputs->data;
         name = g_file_get_parse_name (output);
@@ -2174,7 +2174,7 @@ extract_strings_func (NautilusFileUndoInfo  *info,
     if (total_sources == 1)
     {
         GFile *source;
-        g_autofree gchar *name;
+        g_autofree gchar *name = NULL;
 
         source = self->priv->sources->data;
         name = g_file_get_parse_name (source);
@@ -2319,7 +2319,7 @@ compress_strings_func (NautilusFileUndoInfo  *info,
                        gchar                **redo_description)
 {
     NautilusFileUndoInfoCompress *self = NAUTILUS_FILE_UNDO_INFO_COMPRESS (info);
-    g_autofree gchar *output_name;
+    g_autofree gchar *output_name = NULL;
     gint sources_count;
 
     output_name = g_file_get_parse_name (self->priv->output);
@@ -2329,7 +2329,7 @@ compress_strings_func (NautilusFileUndoInfo  *info,
     if (sources_count == 1)
     {
         GFile *source;
-        g_autofree gchar *source_name;
+        g_autofree gchar *source_name = NULL;
 
         source = self->priv->sources->data;
         source_name = g_file_get_parse_name (source);
diff --git a/src/nautilus-file-utilities.c b/src/nautilus-file-utilities.c
index 4a9100f..c6f6641 100644
--- a/src/nautilus-file-utilities.c
+++ b/src/nautilus-file-utilities.c
@@ -659,7 +659,7 @@ nautilus_generate_unique_file_in_directory (GFile      *directory,
     copy = 1;
     while (g_file_query_exists (child, NULL))
     {
-        g_autofree char *filename;
+        g_autofree char *filename = NULL;
 
         g_object_unref (child);
 
diff --git a/src/nautilus-file.c b/src/nautilus-file.c
index 32d2af8..57e5377 100644
--- a/src/nautilus-file.c
+++ b/src/nautilus-file.c
@@ -8126,7 +8126,7 @@ real_is_special_link (NautilusFile *file)
 gboolean
 nautilus_file_is_archive (NautilusFile *file)
 {
-    g_autofree char *mime_type;
+    g_autofree char *mime_type = NULL;
 
     mime_type = nautilus_file_get_mime_type (file);
 
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index 73c88a1..332e78c 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -1838,7 +1838,7 @@ rename_file_popover_controller_on_name_accepted (NautilusFileNameWidgetControlle
 {
     NautilusFilesView *view;
     NautilusFile *target_file;
-    g_autofree gchar *name;
+    g_autofree gchar *name = NULL;
 
     view = NAUTILUS_FILES_VIEW (user_data);
 
@@ -1903,8 +1903,8 @@ new_folder_dialog_controller_on_name_accepted (NautilusFileNameWidgetController
     NautilusFilesView *view;
     NewFolderData *data;
     GdkPoint *position;
-    g_autofree gchar *parent_uri;
-    g_autofree gchar *name;
+    g_autofree gchar *parent_uri = NULL;
+    g_autofree gchar *name = NULL;
     gboolean with_selection;
 
     view = NAUTILUS_FILES_VIEW (user_data);
@@ -2047,12 +2047,12 @@ compress_dialog_controller_on_name_accepted (NautilusFileNameWidgetController *c
                                              gpointer                          user_data)
 {
     NautilusFilesView *view;
-    g_autofree gchar *name;
+    g_autofree gchar *name = NULL;
     GList *selection;
     GList *source_files = NULL;
     GList *l;
     CompressData *data;
-    g_autoptr (GFile) output;
+    g_autoptr (GFile) output = NULL;
     NautilusCompressionFormat compression_format;
     AutoarFormat format;
     AutoarFilter filter;
@@ -2157,7 +2157,7 @@ nautilus_files_view_compress_dialog_new (NautilusFilesView *view)
 
     if (g_list_length (selection) == 1)
     {
-        g_autofree char *display_name;
+        g_autofree char *display_name = NULL;
 
         display_name = nautilus_file_get_display_name (selection->data);
 
@@ -2649,7 +2649,7 @@ set_up_scripts_directory_global (void)
     if (file_type == G_FILE_TYPE_DIRECTORY &&
         !g_file_query_exists (scripts_directory, NULL))
     {
-        g_autoptr (GFile) updated;
+        g_autoptr (GFile) updated = NULL;
         const char *message;
 
         /* test if we already attempted to migrate first */
@@ -2658,9 +2658,10 @@ set_up_scripts_directory_global (void)
                     "this configuration to ~/.local/share/nautilus");
         if (!g_file_query_exists (updated, NULL))
         {
-            g_autoptr (GFile) parent = g_file_get_parent (scripts_directory);
+            g_autoptr (GFile) parent = NULL;
             g_autoptr (GError) error = NULL;
 
+            parent = g_file_get_parent (scripts_directory);
             g_file_make_directory_with_parents (parent, NULL, &error);
 
             if (error == NULL ||
@@ -6131,7 +6132,7 @@ on_extract_destination_dialog_response (GtkDialog *dialog,
 
     if (response_id == GTK_RESPONSE_OK)
     {
-        g_autoptr (GFile) destination_directory;
+        g_autoptr (GFile) destination_directory = NULL;
 
         destination_directory = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog));
 
diff --git a/src/nautilus-new-folder-dialog-controller.c b/src/nautilus-new-folder-dialog-controller.c
index f4c6044..0958f84 100644
--- a/src/nautilus-new-folder-dialog-controller.c
+++ b/src/nautilus-new-folder-dialog-controller.c
@@ -66,7 +66,7 @@ nautilus_new_folder_dialog_controller_new (GtkWindow         *parent_window,
                                            gchar             *initial_name)
 {
     NautilusNewFolderDialogController *self;
-    g_autoptr (GtkBuilder) builder;
+    g_autoptr (GtkBuilder) builder = NULL;
     GtkWidget *new_folder_dialog;
     GtkWidget *error_revealer;
     GtkWidget *error_label;
diff --git a/src/nautilus-operations-ui-manager.c b/src/nautilus-operations-ui-manager.c
index cb1ae0d..4a1d727 100644
--- a/src/nautilus-operations-ui-manager.c
+++ b/src/nautilus-operations-ui-manager.c
@@ -121,8 +121,8 @@ set_copy_move_dialog_text (FileConflictDialogData *data)
     time_t source_mtime;
     time_t destination_mtime;
     g_autofree gchar *message = NULL;
-    g_autofree gchar *destination_name;
-    g_autofree gchar *destination_directory_name;
+    g_autofree gchar *destination_name = NULL;
+    g_autofree gchar *destination_directory_name = NULL;
     gboolean source_is_directory;
     gboolean destination_is_directory;
 
@@ -323,7 +323,7 @@ set_file_labels (FileConflictDialogData *data)
 static void
 set_conflict_name (FileConflictDialogData *data)
 {
-    g_autofree gchar *edit_name;
+    g_autofree gchar *edit_name = NULL;
 
     edit_name = nautilus_file_get_edit_name (data->destination);
 
@@ -358,7 +358,7 @@ copy_move_conflict_on_file_list_ready (GList    *files,
                                        gpointer  user_data)
 {
     FileConflictDialogData *data = user_data;
-    g_autofree gchar *title;
+    g_autofree gchar *title = NULL;
 
     data->handle = NULL;
 
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index 1ef0dd7..46789ab 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -290,8 +290,8 @@ static NautilusFile *
 get_target_file_for_original_file (NautilusFile *file)
 {
     NautilusFile *target_file;
-    g_autoptr (GFile) location;
-    g_autofree char *uri_to_display;
+    g_autoptr (GFile) location = NULL;
+    g_autofree char *uri_to_display = NULL;
 
     uri_to_display = nautilus_file_get_target_uri (file);
     location = g_file_new_for_uri (uri_to_display);
diff --git a/src/nautilus-query-editor.c b/src/nautilus-query-editor.c
index 85586f7..a01089d 100644
--- a/src/nautilus-query-editor.c
+++ b/src/nautilus-query-editor.c
@@ -477,7 +477,7 @@ search_popover_date_range_changed_cb (NautilusSearchPopover *popover,
                                 priv->date_range_tag);
     if (date_range)
     {
-        g_autofree gchar *text_for_date_range;
+        g_autofree gchar *text_for_date_range = NULL;
 
         text_for_date_range = get_text_for_date_range (date_range);
         gd_tagged_entry_tag_set_label (priv->date_range_tag,
@@ -523,7 +523,7 @@ search_popover_mime_type_changed_cb (NautilusSearchPopover *popover,
     }
     else
     {
-        g_autofree gchar *display_name;
+        g_autofree gchar *display_name = NULL;
 
         mimetypes = g_list_append (NULL, (gpointer) mimetype);
         display_name = g_content_type_get_description (mimetype);
diff --git a/src/nautilus-rename-file-popover-controller.c b/src/nautilus-rename-file-popover-controller.c
index 8475f6a..62c7d08 100644
--- a/src/nautilus-rename-file-popover-controller.c
+++ b/src/nautilus-rename-file-popover-controller.c
@@ -97,7 +97,7 @@ nautilus_rename_file_popover_controller_ignore_existing_file (NautilusFileNameWi
                                                               NautilusFile                     
*existing_file)
 {
     NautilusRenameFilePopoverController *self;
-    g_autofree gchar *display_name;
+    g_autofree gchar *display_name = NULL;
 
     self = NAUTILUS_RENAME_FILE_POPOVER_CONTROLLER (controller);
 
@@ -112,7 +112,7 @@ nautilus_rename_file_popover_controller_new (NautilusFile *target_file,
                                              GtkWidget    *relative_to)
 {
     NautilusRenameFilePopoverController *self;
-    g_autoptr (GtkBuilder) builder;
+    g_autoptr (GtkBuilder) builder = NULL;
     GtkWidget *rename_file_popover;
     GtkWidget *error_revealer;
     GtkWidget *error_label;
diff --git a/src/nautilus-search-directory.c b/src/nautilus-search-directory.c
index 53752b3..959193b 100644
--- a/src/nautilus-search-directory.c
+++ b/src/nautilus-search-directory.c
@@ -759,7 +759,7 @@ search_is_editable (NautilusDirectory *directory)
 static gboolean
 real_handles_location (GFile *location)
 {
-    g_autofree gchar *uri;
+    g_autofree gchar *uri = NULL;
 
     uri = g_file_get_uri (location);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]