summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWojciech Polak <polak@gnu.org>2004-01-13 10:09:44 +0000
committerWojciech Polak <polak@gnu.org>2004-01-13 10:09:44 +0000
commit9667740b1779d36125c5c6b47ab506840a25c193 (patch)
tree4d33a9cf19d1f48495ea98096dcb9dbf76954067
parentc00e6db2910935d81783f0fe681d3cf8bb743dab (diff)
downloadmailutils-9667740b1779d36125c5c6b47ab506840a25c193.tar.gz
mailutils-9667740b1779d36125c5c6b47ab506840a25c193.tar.bz2
Use mu_error()
-rw-r--r--frm/frm.c8
-rw-r--r--messages/messages.c27
2 files changed, 18 insertions, 17 deletions
diff --git a/frm/frm.c b/frm/frm.c
index 3523a8485..efbb3d0b5 100644
--- a/frm/frm.c
+++ b/frm/frm.c
@@ -388,7 +388,7 @@ main (int argc, char **argv)
status = mailbox_create_default (&mbox, mailbox_name);
if (status != 0)
{
- mu_error (_("Couldn't create mailbox <%s>: %s.\n"),
+ mu_error (_("Couldn't create mailbox <%s>: %s."),
mailbox_name ? mailbox_name : _("default"),
mu_strerror (status));
exit (3);
@@ -410,7 +410,7 @@ main (int argc, char **argv)
goto cleanup1;
else
{
- mu_error (_("Couldn't open mailbox <%s>: %s.\n"),
+ mu_error (_("Couldn't open mailbox <%s>: %s."),
url_to_string (url), mu_strerror (status));
goto cleanup;
}
@@ -427,7 +427,7 @@ main (int argc, char **argv)
status = mailbox_scan (mbox, 1, &total);
if (status != 0)
{
- mu_error (_("Couldn't scan mailbox <%s>: %s.\n"),
+ mu_error (_("Couldn't scan mailbox <%s>: %s."),
url_to_string (url), mu_strerror (status));
goto cleanup;
}
@@ -441,7 +441,7 @@ main (int argc, char **argv)
cleanup:
if (mailbox_close (mbox) != 0)
{
- mu_error (_("Couldn't close <%s>: %s.\n"),
+ mu_error (_("Couldn't close <%s>: %s."),
url_to_string (url), mu_strerror (status));
return -1;
}
diff --git a/messages/messages.c b/messages/messages.c
index 28a54d172..6fa128a71 100644
--- a/messages/messages.c
+++ b/messages/messages.c
@@ -111,12 +111,14 @@ main (int argc, char **argv)
mu_register_all_mbox_formats ();
if (args.argc < 1 && messages_count (NULL) < 0)
- err = 1;
+ err = 1;
else if (args.argc >= 1)
{
- for (i=0; i < args.argc; i++)
- if (messages_count (args.argv[i]) < 0)
- err = 1;
+ for (i = 0; i < args.argc; i++)
+ {
+ if (messages_count (args.argv[i]) < 0)
+ err = 1;
+ }
}
return err;
@@ -133,9 +135,8 @@ messages_count (const char *box)
status = mailbox_create_default (&mbox, box);
if (status != 0)
{
- fprintf (stderr, _("Couldn't create mailbox <%s>: %s.\n"),
- box ? box : _("default"),
- mu_strerror (status));
+ mu_error (_("Couldn't create mailbox <%s>: %s."),
+ box ? box : _("default"), mu_strerror (status));
return -1;
}
@@ -145,16 +146,16 @@ messages_count (const char *box)
status = mailbox_open (mbox, MU_STREAM_READ);
if (status != 0)
{
- fprintf (stderr, _("Couldn't open mailbox <%s>: %s.\n"),
- box, mu_strerror (status));
+ mu_error (_("Couldn't open mailbox <%s>: %s."),
+ box, mu_strerror (status));
return -1;
}
status = mailbox_messages_count (mbox, &count);
if (status != 0)
{
- fprintf (stderr, _("Couldn't count messages in <%s>: %s.\n"),
- box, mu_strerror (status));
+ mu_error (_("Couldn't count messages in <%s>: %s."),
+ box, mu_strerror (status));
return -1;
}
@@ -166,8 +167,8 @@ messages_count (const char *box)
status = mailbox_close (mbox);
if (status != 0)
{
- fprintf (stderr, _("Couldn't close <%s>: %s.\n"),
- box, mu_strerror (status));
+ mu_error (_("Couldn't close <%s>: %s."),
+ box, mu_strerror (status));
return -1;
}

Return to:

Send suggestions and report system problems to the System administrator.