append _unused to the expression defined using unused() macro

[notmuch] / notmuch-setup.c

diff --git a/notmuch-setup.c b/notmuch-setup.c
index 475248b1f9735b2e10f00f013deffa0baac85e7a..81419ccf3a9426b56117e1eb44efbb642600d74e 100644 (file)
--- a/notmuch-setup.c
+++ b/notmuch-setup.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Author: Carl Worth <cworth@cworth.org>
  */
@@ -121,7 +121,7 @@ parse_tag_list (void *ctx, char *response)
 
 int
 notmuch_setup_command (notmuch_config_t *config,
-                      unused (int argc), unused (char *argv[]))
+                      int argc, char *argv[])
 {
     char *response = NULL;
     size_t response_size = 0;
@@ -140,11 +140,18 @@ notmuch_setup_command (notmuch_config_t *config,
        fflush (stdout);                                        \
        if (getline (&response, &response_size, stdin) < 0) {   \
            printf ("Exiting.\n");                              \
-           exit (1);                                           \
+           exit (EXIT_FAILURE);                                \
        }                                                       \
        chomp_newline (response);                               \
     } while (0)
 
+    if (notmuch_minimal_options ("setup", argc, argv) < 0)
+       return EXIT_FAILURE;
+
+    if (notmuch_requested_db_uuid)
+       fprintf (stderr, "Warning: ignoring --uuid=%s\n",
+                notmuch_requested_db_uuid);
+
     if (notmuch_config_is_new (config))
        welcome_message_pre_setup ();
 
@@ -180,7 +187,7 @@ notmuch_setup_command (notmuch_config_t *config,
                                             (const char **)
                                             other_emails->pdata,
                                             other_emails->len);
-    g_ptr_array_free (other_emails, TRUE);
+    g_ptr_array_free (other_emails, true);
 
     prompt ("Top-level directory of your email archive [%s]: ",
            notmuch_config_get_database_path (config));
@@ -203,7 +210,7 @@ notmuch_setup_command (notmuch_config_t *config,
        notmuch_config_set_new_tags (config, (const char **) tags->pdata,
                                     tags->len);
 
-       g_ptr_array_free (tags, TRUE);
+       g_ptr_array_free (tags, true);
     }
 
 
@@ -220,15 +227,14 @@ notmuch_setup_command (notmuch_config_t *config,
                                                (const char **) tags->pdata,
                                                tags->len);
 
-       g_ptr_array_free (tags, TRUE);
+       g_ptr_array_free (tags, true);
     }
 
+    if (notmuch_config_save (config))
+       return EXIT_FAILURE;
 
-    if (! notmuch_config_save (config)) {
-       if (notmuch_config_is_new (config))
-         welcome_message_post_setup ();
-       return 0;
-    } else {
-       return 1;
-    }
+    if (notmuch_config_is_new (config))
+       welcome_message_post_setup ();
+
+    return EXIT_SUCCESS;
 }