Add -Wmising-declarations and fix warnings.

[notmuch] / notmuch.c

diff --git a/notmuch.c b/notmuch.c
index 46c3c63b525f626e18802772a8f0d27dd30f98f9..ef93ded9b3a848297e1d72c960801eb528a48500 100644 (file)
--- a/notmuch.c
+++ b/notmuch.c
@@ -43,6 +43,22 @@
 
 #include <glib.h> /* g_strdup_printf */
 
+#define unused(x) x __attribute__ ((unused))
+
+/* There's no point in continuing when we've detected that we've done
+ * something wrong internally (as opposed to the user passing in a
+ * bogus value).
+ *
+ * Note that __location__ comes from talloc.h.
+ */
+#define INTERNAL_ERROR(format, ...)                    \
+    do {                                               \
+       fprintf(stderr,                                 \
+               "Internal error: " format " (%s)\n",    \
+               ##__VA_ARGS__, __location__);           \
+       exit (1);                                       \
+    } while (0)
+
 #define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0]))
 
 typedef int (*command_function_t) (int argc, char *argv[]);
@@ -71,14 +87,14 @@ chomp_newline (char *str)
 }
 
 /* Compute the number of seconds elapsed from start to end. */
-double
+static double
 tv_elapsed (struct timeval start, struct timeval end)
 {
     return ((end.tv_sec - start.tv_sec) +
            (end.tv_usec - start.tv_usec) / 1e6);
 }
 
-void
+static void
 print_formatted_seconds (double seconds)
 {
     int hours;
@@ -104,7 +120,7 @@ print_formatted_seconds (double seconds)
     printf ("%ds", (int) seconds);
 }
 
-void
+static void
 add_files_print_progress (add_files_state_t *state)
 {
     struct timeval tv_now;
@@ -149,7 +165,7 @@ add_files_print_progress (add_files_state_t *state)
  * The 'struct stat *st' must point to a structure that has already
  * been initialized for 'path' by calling stat().
  */
-notmuch_status_t
+static notmuch_status_t
 add_files_recursive (notmuch_database_t *notmuch,
                     const char *path,
                     struct stat *st,
@@ -255,8 +271,7 @@ add_files_recursive (notmuch_database_t *notmuch,
                        ret = status;
                        goto DONE;
                    default:
-                       fprintf (stderr, "Internal error: add_message returned unexpected value: %d\n",  status);
-                       ret = status;
+                       INTERNAL_ERROR ("add_message returned unexpected value: %d",  status);
                        goto DONE;
                }
                if (state->processed_files % 1000 == 0)
@@ -317,7 +332,7 @@ add_files (notmuch_database_t *notmuch,
  * of path.  The result is added to *count (which should be
  * initialized to zero by the top-level caller before calling
  * count_files). */
-void
+static void
 count_files (const char *path, int *count)
 {
     DIR *dir;
@@ -385,8 +400,8 @@ count_files (const char *path, int *count)
     closedir (dir);
 }
 
-int
-setup_command (int argc, char *argv[])
+static int
+setup_command (unused (int argc), unused (char *argv[]))
 {
     notmuch_database_t *notmuch = NULL;
     char *default_path, *mail_directory = NULL;
@@ -511,8 +526,8 @@ setup_command (int argc, char *argv[])
     return ret;
 }
 
-int
-new_command (int argc, char *argv[])
+static int
+new_command (unused (int argc), unused (char *argv[]))
 {
     notmuch_database_t *notmuch;
     const char *mail_directory;
@@ -581,7 +596,7 @@ new_command (int argc, char *argv[])
     return ret;
 }
 
-int
+static int
 search_command (int argc, char *argv[])
 {
     void *local = talloc_new (NULL);
@@ -653,14 +668,14 @@ search_command (int argc, char *argv[])
     return ret;
 }
 
-int
-show_command (int argc, char *argv[])
+static int
+show_command (unused (int argc), unused (char *argv[]))
 {
     fprintf (stderr, "Error: show is not implemented yet.\n");
     return 1;
 }
 
-int
+static int
 dump_command (int argc, char *argv[])
 {
     FILE *output;
@@ -736,13 +751,14 @@ dump_command (int argc, char *argv[])
     return ret;
 }
 
-int
+static int
 restore_command (int argc, char *argv[])
 {
     FILE *input;
     notmuch_database_t *notmuch = NULL;
     char *line = NULL;
-    size_t line_size, line_len;
+    size_t line_size;
+    ssize_t line_len;
     regex_t regex;
     int rerr;
     int ret = 0;
@@ -876,11 +892,11 @@ command_t commands[] = {
       "\t\tRestore the tags from the given dump file (see 'dump')." }
 };
 
-void
+static void
 usage (void)
 {
     command_t *command;
-    int i;
+    unsigned int i;
 
     fprintf (stderr, "Usage: notmuch <command> [args...]\n");
     fprintf (stderr, "\n");
@@ -898,7 +914,7 @@ int
 main (int argc, char *argv[])
 {
     command_t *command;
-    int i;
+    unsigned int i;
 
     if (argc == 1)
        return setup_command (0, NULL);