refactor: Merge cleanup routines

src/rifiuti-vista.c

@@ -13,7 +13,6 @@
 #include "utils.h"
 #include "rifiuti-vista.h"
 
-static exitcode     exit_status = EXIT_OK;
 extern metarecord  *meta;
 
 
@@ -355,10 +354,5 @@ main (int    argc,
 
     cleanup:
 
-    exit_status = rifiuti_handle_global_error (error);
-    if (rifiuti_handle_record_error () && exit_status == EXIT_OK)
-        exit_status = EXIT_ERR_DUBIOUS_DATA;
-
-    rifiuti_cleanup ();
-    return exit_status;
+    return rifiuti_cleanup (&error);
 }

src/rifiuti.c

@@ -14,7 +14,6 @@
 #include "rifiuti.h"
 
 
-static exitcode     exit_status = EXIT_OK;
 extern char        *legacy_encoding;
 extern metarecord  *meta;
 
@@ -379,10 +378,5 @@ main (int    argc,
 
     cleanup:
 
-    exit_status = rifiuti_handle_global_error (error);
-    if (rifiuti_handle_record_error () && exit_status == EXIT_OK)
-        exit_status = EXIT_ERR_DUBIOUS_DATA;
-
-    rifiuti_cleanup ();
-    return exit_status;
+    return rifiuti_cleanup (&error);
 }

src/utils.c

@@ -6,6 +6,7 @@
 
 #include "config.h"
 
+#include <stdbool.h>
 #include <locale.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
@@ -1461,7 +1462,7 @@ dump_content (GError **error)
 
 static void
 _dump_rec_error   (rbin_struct  *record,
-                   gboolean     *flag)
+                   bool         *flag)
 {
     g_return_if_fail (record);
 
@@ -1470,7 +1471,7 @@ _dump_rec_error   (rbin_struct  *record,
 
     if (! *flag)
     {
-        *flag = TRUE;
+        *flag = true;
         g_printerr ("\n%s\n", _("Error occurred in following record:"));
     }
 
@@ -1491,43 +1492,51 @@ _dump_rec_error   (rbin_struct  *record,
  * @return program exit code
  */
 exitcode
-rifiuti_handle_global_error (GError *error)
+_get_exit_code   (const GError   *error)
 {
     exitcode code = EXIT_OK;
 
-    if (error)
-    {
-        g_printerr ("Fatal error: %s\n", error->message);
-        if (error->domain == G_OPTION_ERROR)
-            code = EXIT_ERR_ARG;
-        else if (error->domain == G_FILE_ERROR)
-            code = EXIT_ERR_OPEN_FILE;
-        else if (g_error_matches (error,
-            R2_FATAL_ERROR, R2_FATAL_ERROR_ILLEGAL_DATA))
-            code = EXIT_ERR_ILLEGAL_DATA;
-        else if (g_error_matches (error,
-            R2_FATAL_ERROR, R2_FATAL_ERROR_TEMPFILE))
-            code = EXIT_ERR_WRITE_FILE;
-        else if (g_error_matches (error,
-            R2_FATAL_ERROR, R2_FATAL_ERROR_LIVE_UNSUPPORTED))
-            code = EXIT_ERR_NO_LIVE;
-        else {
-            g_critical ("Error not handled: quark = %s, code = %d",
-                g_quark_to_string (error->domain), error->code);
-            code = EXIT_ERR_UNHANDLED;
-        }
-        g_error_free (error);
+    if (error == NULL)
+        return code;
+
+    g_printerr ("Fatal error: %s\n", error->message);
+
+    if (error->domain == G_OPTION_ERROR)
+        code = EXIT_ERR_ARG;
+    else if (error->domain == G_FILE_ERROR)
+        code = EXIT_ERR_OPEN_FILE;
+    else if (g_error_matches (error,
+        R2_FATAL_ERROR, R2_FATAL_ERROR_ILLEGAL_DATA))
+        code = EXIT_ERR_ILLEGAL_DATA;
+    else if (g_error_matches (error,
+        R2_FATAL_ERROR, R2_FATAL_ERROR_TEMPFILE))
+        code = EXIT_ERR_WRITE_FILE;
+    else if (g_error_matches (error,
+        R2_FATAL_ERROR, R2_FATAL_ERROR_LIVE_UNSUPPORTED))
+        code = EXIT_ERR_NO_LIVE;
+    else {
+        g_critical ("Error not handled: quark = %s, code = %d",
+            g_quark_to_string (error->domain), error->code);
+        code = EXIT_ERR_UNHANDLED;
     }
 
-    if (g_hash_table_size (meta->invalid_records))
-    {
-        GHashTableIter iter;
-        gpointer key, val;
+    return code;
+}
 
-        code = EXIT_ERR_DUBIOUS_DATA;
 
+bool
+_has_record_error   (void)
+{
+    bool flag = false;  // Determine occasion to print headline
+    GHashTableIter iter;
+    gpointer key, val;
+
+    if (g_hash_table_size (meta->invalid_records))
+    {
+        flag = true;
         g_hash_table_iter_init (&iter, meta->invalid_records);
         g_printerr ("%s\n", _("Error occurred in following record:"));
+
         while (g_hash_table_iter_next (&iter, &key, &val))
         {
             char *record_id = (char *) key;
@@ -1544,14 +1553,6 @@ rifiuti_handle_global_error (GError *error)
             g_free (record_id);
         }
     }
-    return code;
-}
-
-
-gboolean
-rifiuti_handle_record_error (void)
-{
-    gboolean flag = FALSE;
 
     g_ptr_array_foreach (meta->records,
             (GFunc) _dump_rec_error, &flag);
@@ -1561,13 +1562,24 @@ rifiuti_handle_record_error (void)
 
 
 /**
- * @brief Final cleanup before exiting program, e.g. free all variables
- * @param meta Pointer to metadata structure
+ * @brief Dump error and perform final cleanup
+ * @param error The global `GError` to process
+ * @return program exit code
  */
-void
-rifiuti_cleanup (void)
+exitcode
+rifiuti_cleanup   (GError   **error)
 {
-    g_debug ("Cleaning up...");
+    exitcode code = EXIT_OK;
+
+    g_return_val_if_fail (error != NULL, EXIT_ERR_UNHANDLED);
+
+    code = _get_exit_code ((const GError *) (*error));
+    g_clear_error (error);
+
+    if (_has_record_error () && code == EXIT_OK)
+        code = EXIT_ERR_DUBIOUS_DATA;
+
+    g_debug ("Final cleanup...");
 
     g_ptr_array_unref (meta->records);
     g_hash_table_destroy (meta->invalid_records);
@@ -1585,6 +1597,8 @@ rifiuti_cleanup (void)
 #ifdef G_OS_WIN32
     cleanup_windows_res ();
 #endif
+
+    return code;
 }
 
 

src/utils.h

@@ -241,10 +241,7 @@ GDateTime *   win_filetime_to_gdatetime   (int64_t           win_filetime);
 
 gboolean      dump_content                (GError          **error);
 
-exitcode      rifiuti_handle_global_error (GError           *error);
-gboolean      rifiuti_handle_record_error (void);
-
-void          rifiuti_cleanup             (void);
+exitcode      rifiuti_cleanup             (GError          **error);
 
 void          hexdump                     (void             *start,
                                            size_t            size);