debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 10:58:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

notmuch-restore: tidy formatting

Browse source 
This is again the work of uncrustify.

I remember there is some controversy about "! foo" versus "!foo", but
in context I think "! foo" looks OK. Also, for functions "! foo
(blah)" seems better than "!foo (blah)".
This commit is contained in:
David Bremner 2012-11-14 21:33:21 -04:00
parent 127c788e45
commit 660e1b6437
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
notmuch-restore.c
View file

@ -38,13 +38,13 @@ tag_message (notmuch_database_t *notmuch, const char *message_id,
fprintf (stderr, "Warning: Cannot apply tags to %smessage: %s\n", fprintf (stderr, "Warning: Cannot apply tags to %smessage: %s\n",
message ? "" : "missing ", message_id); message ? "" : "missing ", message_id);
if (status) if (status)
fprintf (stderr, "%s\n", notmuch_status_to_string(status)); fprintf (stderr, "%s\n", notmuch_status_to_string (status));
return 1; return 1;
} }
/* In order to detect missing messages, this check/optimization is /* In order to detect missing messages, this check/optimization is
* intentionally done *after* first finding the message. */ * intentionally done *after* first finding the message. */
if (!remove_all && (file_tags == NULL || *file_tags == '\0')) if (! remove_all && (file_tags == NULL || *file_tags == '\0'))
goto DONE; goto DONE;
db_tags_str = NULL; db_tags_str = NULL;
@ -88,7 +88,7 @@ tag_message (notmuch_database_t *notmuch, const char *message_id,
if (synchronize_flags) if (synchronize_flags)
notmuch_message_tags_to_maildir_flags (message); notmuch_message_tags_to_maildir_flags (message);
DONE: DONE:
if (message) if (message)
notmuch_message_destroy (message); notmuch_message_destroy (message);
@ -145,7 +145,7 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
if (opt_index < argc) { if (opt_index < argc) {
fprintf (stderr, fprintf (stderr,
"Unused positional parameter: %s\n", "Unused positional parameter: %s\n",
argv[opt_index]); argv[opt_index]);
return 1; return 1;
} }
@ -157,7 +157,7 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
if ( xregcomp (&regex, if ( xregcomp (&regex,
"^([^ ]+) \\(([^)]*)\\)$", "^([^ ]+) \\(([^)]*)\\)$",
REG_EXTENDED) ) REG_EXTENDED) )
INTERNAL_ERROR("compile time constant regex failed."); INTERNAL_ERROR ("compile time constant regex failed.");
while ((line_len = getline (&line, &line_size, input)) != -1) { while ((line_len = getline (&line, &line_size, input)) != -1) {
regmatch_t match[3]; regmatch_t match[3];
@ -166,8 +166,7 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
chomp_newline (line); chomp_newline (line);
rerr = xregexec (&regex, line, 3, match, 0); rerr = xregexec (&regex, line, 3, match, 0);
if (rerr == REG_NOMATCH) if (rerr == REG_NOMATCH) {
{
fprintf (stderr, "Warning: Ignoring invalid input line: %s\n", fprintf (stderr, "Warning: Ignoring invalid input line: %s\n",
line); line);
continue; continue;
@ -178,7 +177,7 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
file_tags = xstrndup (line + match[2].rm_so, file_tags = xstrndup (line + match[2].rm_so,
match[2].rm_eo - match[2].rm_so); match[2].rm_eo - match[2].rm_so);
tag_message (notmuch, message_id, file_tags, !accumulate, tag_message (notmuch, message_id, file_tags, ! accumulate,
synchronize_flags); synchronize_flags);
free (message_id); free (message_id);