projects
/
notmuch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test: add test for ,S message without 'unread' in new.tags
[notmuch.git]
/
notmuch-new.c
diff --git
a/notmuch-new.c
b/notmuch-new.c
index e2822e23060786ee9674e3d9371cec44782315ba..16b4d0225a649264c4931aba540be2b072842783 100644
(file)
--- a/
notmuch-new.c
+++ b/
notmuch-new.c
@@
-131,10
+131,10
@@
generic_print_progress (const char *action, const char *object,
elapsed_overall = notmuch_time_elapsed (tv_start, tv_now);
rate_overall = processed / elapsed_overall;
elapsed_overall = notmuch_time_elapsed (tv_start, tv_now);
rate_overall = processed / elapsed_overall;
- printf ("%s %
d
", action, processed);
+ printf ("%s %
u
", action, processed);
if (total) {
if (total) {
- printf ("of %
d
%s", total, object);
+ printf ("of %
u
%s", total, object);
if (processed > 0 && elapsed_overall > 0.5) {
double time_remaining = ((total - processed) / rate_overall);
printf (" (");
if (processed > 0 && elapsed_overall > 0.5) {
double time_remaining = ((total - processed) / rate_overall);
printf (" (");
@@
-291,8
+291,7
@@
add_file (notmuch_database_t *notmuch, const char *filename,
case NOTMUCH_STATUS_READ_ONLY_DATABASE:
case NOTMUCH_STATUS_XAPIAN_EXCEPTION:
case NOTMUCH_STATUS_OUT_OF_MEMORY:
case NOTMUCH_STATUS_READ_ONLY_DATABASE:
case NOTMUCH_STATUS_XAPIAN_EXCEPTION:
case NOTMUCH_STATUS_OUT_OF_MEMORY:
- fprintf (stderr, "Error: %s. Halting processing.\n",
- notmuch_status_to_string (status));
+ (void) print_status_database("add_file", notmuch, status);
goto DONE;
default:
INTERNAL_ERROR ("add_message returned unexpected value: %d", status);
goto DONE;
default:
INTERNAL_ERROR ("add_message returned unexpected value: %d", status);
@@
-850,7
+849,7
@@
_remove_directory (void *ctx,
const char *path,
add_files_state_t *add_files_state)
{
const char *path,
add_files_state_t *add_files_state)
{
- notmuch_status_t status
= NOTMUCH_STATUS_SUCCESS
;
+ notmuch_status_t status;
notmuch_directory_t *directory;
notmuch_filenames_t *files, *subdirs;
char *absolute;
notmuch_directory_t *directory;
notmuch_filenames_t *files, *subdirs;
char *absolute;