From b4d7c0892ef5b329476a6c3689585ca60ca2d8b0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 2 May 2009 23:11:12 -0400 Subject: Bug 572977 – Use g_strerror() instead of strerror() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addressbook/gui/component/addressbook-migrate.c | 2 +- calendar/gui/migration.c | 2 +- e-util/e-mktemp.c | 2 +- mail/mail-mt.c | 2 +- mail/mail-ops.c | 2 +- plugins/ipod-sync/sync.c | 2 +- plugins/sa-junk-plugin/em-junk-filter.c | 10 +++++----- tools/killev.c | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/addressbook/gui/component/addressbook-migrate.c b/addressbook/gui/component/addressbook-migrate.c index 09d1a1af9f..f0e106e14c 100644 --- a/addressbook/gui/component/addressbook-migrate.c +++ b/addressbook/gui/component/addressbook-migrate.c @@ -1063,7 +1063,7 @@ migrate_pilot_data (const char *old_path, const char *new_path) n = fsync (fd1); if (n == -1) { - g_warning ("Failed to migrate %s: %s", dent, strerror (errno)); + g_warning ("Failed to migrate %s: %s", dent, g_strerror (errno)); g_unlink (filename); } diff --git a/calendar/gui/migration.c b/calendar/gui/migration.c index 80d58b67fd..0f012d5f12 100644 --- a/calendar/gui/migration.c +++ b/calendar/gui/migration.c @@ -689,7 +689,7 @@ migrate_pilot_data (const char *component, const char *conduit, const char *old_ n = fsync (fd1); if (n == -1) { - g_warning ("Failed to migrate %s: %s", dent, strerror (errno)); + g_warning ("Failed to migrate %s: %s", dent, g_strerror (errno)); g_unlink (filename); } diff --git a/e-util/e-mktemp.c b/e-util/e-mktemp.c index 80bce49cce..ade1abc0b4 100644 --- a/e-util/e-mktemp.c +++ b/e-util/e-mktemp.c @@ -84,7 +84,7 @@ expire_dir_rec(const char *base, time_t now) count++; } } else if (g_unlink(path->str) == -1) { - d(printf("expiry failed: %s\n", strerror(errno))); + d(printf("expiry failed: %s\n", g_strerror(errno))); count++; } else { d(printf("expired %s\n", path->str)); diff --git a/mail/mail-mt.c b/mail/mail-mt.c index 99d691b1ca..5d26c13b3f 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -111,7 +111,7 @@ mail_msg_new (MailMsgInfo *info) fprintf(log, "%" G_GINT64_MODIFIER "x: lock mail_msg_lock\n", e_util_pthread_id(pthread_self())); } } else { - g_warning ("Could not open log file: %s", strerror(errno)); + g_warning ("Could not open log file: %s", g_strerror(errno)); log_ops = log_locks = FALSE; } } diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 5d9386b6c0..0eb6c9414c 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -2091,7 +2091,7 @@ save_messages_exec (struct _save_messages_msg *m) || camel_data_wrapper_write_to_stream((CamelDataWrapper *)message, (CamelStream *)filtered_stream) == -1 || camel_stream_flush((CamelStream *)filtered_stream) == -1) { camel_exception_setv(&m->base.ex, CAMEL_EXCEPTION_SYSTEM, - _("Error saving messages to: %s:\n %s"), m->path, strerror(errno)); + _("Error saving messages to: %s:\n %s"), m->path, g_strerror(errno)); g_free(from); camel_object_unref((CamelObject *)message); break; diff --git a/plugins/ipod-sync/sync.c b/plugins/ipod-sync/sync.c index a444af1bd9..42f3bdfa0b 100644 --- a/plugins/ipod-sync/sync.c +++ b/plugins/ipod-sync/sync.c @@ -184,7 +184,7 @@ write_to_ipod (GString *str, char *path, char *filename) if (f == NULL) { - critical_error (_("Could not export data!"), strerror (errno)); + critical_error (_("Could not export data!"), g_strerror (errno)); } /* Convert the input string into UTF16 */ diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c index fb30833080..5114e9b386 100644 --- a/plugins/sa-junk-plugin/em-junk-filter.c +++ b/plugins/sa-junk-plugin/em-junk-filter.c @@ -141,16 +141,16 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err, if (pipe (fds) == -1) { errnosav = errno; - d(printf ("failed to create a pipe (for use with SpamAssassin: %s\n", strerror (errno))); - g_set_error (error, EM_JUNK_ERROR, errnosav, _("Failed to create pipe: %s"), strerror (errnosav)); + d(printf ("failed to create a pipe (for use with SpamAssassin: %s\n", g_strerror (errno))); + g_set_error (error, EM_JUNK_ERROR, errnosav, _("Failed to create pipe: %s"), g_strerror (errnosav)); errno = errnosav; return rv_err; } if (output_buffer && pipe (out_fds) == -1) { errnosav = errno; - d(printf ("failed to create a pipe (for use with SpamAssassin: %s\n", strerror (errno))); - g_set_error (error, EM_JUNK_ERROR, errnosav, _("Failed to create pipe: %s"), strerror (errnosav)); + d(printf ("failed to create a pipe (for use with SpamAssassin: %s\n", g_strerror (errno))); + g_set_error (error, EM_JUNK_ERROR, errnosav, _("Failed to create pipe: %s"), g_strerror (errnosav)); close (fds [0]); close (fds [1]); errno = errnosav; @@ -189,7 +189,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err, close (out_fds [1]); } if (errnosav != 0 && errnosav != -1) - g_set_error (error, EM_JUNK_ERROR, errnosav, _("Error after fork: %s"), strerror (errnosav)); + g_set_error (error, EM_JUNK_ERROR, errnosav, _("Error after fork: %s"), g_strerror (errnosav)); errno = errnosav; return rv_err; } diff --git a/tools/killev.c b/tools/killev.c index 6d9fd925cb..797e9230b5 100644 --- a/tools/killev.c +++ b/tools/killev.c @@ -59,7 +59,7 @@ kill_process (const char *proc_name, KillevComponent *comp) * found, so just bail completely. */ fprintf (stderr, _("Could not execute '%s': %s\n"), - KILL_PROCESS_CMD, strerror (errno)); + KILL_PROCESS_CMD, g_strerror (errno)); exit (1); } -- cgit