Make the add_files function static within notmuch-new.c.

No other files need this function so we don't need it exported in
notmuch-client.h.

diff --git a/notmuch-client.h b/notmuch-client.h
index eca99906da532702dc653e9f580abe9a8ebb5029..77766de2cb56cda4bb8ac019426e16380c380839 100644 (file)
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -70,20 +70,6 @@
 #define STRNCMP_LITERAL(var, literal) \
     strncmp ((var), (literal), sizeof (literal) - 1)
 
-typedef void (*add_files_callback_t) (notmuch_message_t *message);
-
-typedef struct {
-    int output_is_a_tty;
-    int verbose;
-
-    int total_files;
-    int processed_files;
-    int added_messages;
-    struct timeval tv_start;
-
-    add_files_callback_t callback;
-} add_files_state_t;
-
 static inline void
 chomp_newline (char *str)
 {
@@ -130,10 +116,6 @@ notmuch_time_print_formatted_seconds (double seconds);
 double
 notmuch_time_elapsed (struct timeval start, struct timeval end);
 
-notmuch_status_t
-add_files (notmuch_database_t *notmuch, const char *path,
-          add_files_state_t *state);
-
 char *
 query_string_from_args (void *ctx, int argc, char *argv[]);
 

diff --git a/notmuch-new.c b/notmuch-new.c
index ee6f196ecb9b79346c586a44265403f5ddcb3b71..9ee15812685ecf96c6c96d5d043d4713e774db07 100644 (file)
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -22,6 +22,20 @@
 
 #include <unistd.h>
 
+typedef void (*add_files_callback_t) (notmuch_message_t *message);
+
+typedef struct {
+    int output_is_a_tty;
+    int verbose;
+
+    int total_files;
+    int processed_files;
+    int added_messages;
+    struct timeval tv_start;
+
+    add_files_callback_t callback;
+} add_files_state_t;
+
 static volatile sig_atomic_t do_add_files_print_progress = 0;
 
 static void
@@ -300,7 +314,7 @@ add_files_recursive (notmuch_database_t *notmuch,
 /* This is the top-level entry point for add_files. It does a couple
  * of error checks, sets up the progress-printing timer and then calls
  * into the recursive function. */
-notmuch_status_t
+static notmuch_status_t
 add_files (notmuch_database_t *notmuch,
           const char *path,
           add_files_state_t *state)