diff options
| -rw-r--r-- | notmuch-client.h | 18 | ||||
| -rw-r--r-- | notmuch-new.c | 16 |
2 files changed, 15 insertions, 19 deletions
diff --git a/notmuch-client.h b/notmuch-client.h index eca99906..77766de2 100644 --- 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 ee6f196e..9ee15812 100644 --- 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) |