aboutsummaryrefslogtreecommitdiffhomepage
path: root/notmuch-restore.c
diff options
context:
space:
mode:
authorGravatar David Bremner <bremner@debian.org>2012-11-14 21:33:21 -0400
committerGravatar David Bremner <bremner@debian.org>2012-11-16 08:46:07 -0400
commit660e1b64370e864b6ecee6303bbbae9f20d01830 (patch)
tree95127244f4074bad65cd6c2b28c115ac02354516 /notmuch-restore.c
parent127c788e452bab2afee7f79cac02b889d7c92f56 (diff)
notmuch-restore: tidy formatting
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)".
Diffstat (limited to 'notmuch-restore.c')
-rw-r--r--notmuch-restore.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/notmuch-restore.c b/notmuch-restore.c
index 7d8f44c4..f03dcaca 100644
--- a/notmuch-restore.c
+++ b/notmuch-restore.c
@@ -38,13 +38,13 @@ tag_message (notmuch_database_t *notmuch, const char *message_id,
fprintf (stderr, "Warning: Cannot apply tags to %smessage: %s\n",
message ? "" : "missing ", message_id);
if (status)
- fprintf (stderr, "%s\n", notmuch_status_to_string(status));
+ fprintf (stderr, "%s\n", notmuch_status_to_string (status));
return 1;
}
/* In order to detect missing messages, this check/optimization is
* 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;
db_tags_str = NULL;
@@ -88,7 +88,7 @@ tag_message (notmuch_database_t *notmuch, const char *message_id,
if (synchronize_flags)
notmuch_message_tags_to_maildir_flags (message);
-DONE:
+ DONE:
if (message)
notmuch_message_destroy (message);
@@ -145,7 +145,7 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
if (opt_index < argc) {
fprintf (stderr,
- "Unused positional parameter: %s\n",
+ "Unused positional parameter: %s\n",
argv[opt_index]);
return 1;
}
@@ -157,7 +157,7 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
if ( xregcomp (&regex,
"^([^ ]+) \\(([^)]*)\\)$",
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) {
regmatch_t match[3];
@@ -166,8 +166,7 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
chomp_newline (line);
rerr = xregexec (&regex, line, 3, match, 0);
- if (rerr == REG_NOMATCH)
- {
+ if (rerr == REG_NOMATCH) {
fprintf (stderr, "Warning: Ignoring invalid input line: %s\n",
line);
continue;
@@ -178,7 +177,7 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
file_tags = xstrndup (line + 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);
free (message_id);