Renamed mu_errstring to mu_strerror for consistency with the usual practice.

46 files changed, 177 insertions, 176 deletions

diff --git a/comsat/comsat.c b/comsat/comsat.c
index 9b9b99f66..f5b4c3040 100644
--- a/comsat/comsat.c
+++ b/comsat/comsat.c
@@ -449,21 +449,21 @@ notify_user (const char *user, const char *device, const char *path, off_t offse
       || (status = mailbox_open (mbox, MU_STREAM_READ)) != 0)
     {
       syslog (LOG_ERR, _("can't open mailbox %s: %s"),
-	      path, mu_errstring (status));
+	      path, mu_strerror (status));
       return;
     }
 
   if ((status = mailbox_get_stream (mbox, &stream)))
     {
       syslog (LOG_ERR, _("can't get stream for mailbox %s: %s"),
-	      path, mu_errstring (status));
+	      path, mu_strerror (status));
       return;
     }
 
   if ((status = stream_size (stream, (off_t *) &size)))
     {
       syslog (LOG_ERR, _("can't get stream size (mailbox %s): %s"),
-	      path, mu_errstring (status));
+	      path, mu_strerror (status));
       return;
     }
 
@@ -480,14 +480,14 @@ notify_user (const char *user, const char *device, const char *path, off_t offse
       || (status = mailbox_open (tmp, MU_STREAM_READ)) != 0)
     {
       syslog (LOG_ERR, _("can't create temporary mailbox: %s"),
-	      mu_errstring (status));
+	      mu_strerror (status));
       return;
     }
 
   if ((status = memory_stream_create (&stream, 0, 0)))
     {
       syslog (LOG_ERR, _("can't create temporary stream: %s"),
-	      mu_errstring (status));
+	      mu_strerror (status));
       return;
     }
 
diff --git a/dotlock/dotlock.c b/dotlock/dotlock.c
index bbe592a9a..f50da0dfb 100644
--- a/dotlock/dotlock.c
+++ b/dotlock/dotlock.c
@@ -153,7 +153,7 @@ main (int argc, char *argv[])
   if ((err = locker_create (&locker, file, flags)))
     {
       if (debug)
-	fprintf (stderr, _("locker create failed: %s\n"), mu_errstring (err));
+	fprintf (stderr, _("locker create failed: %s\n"), mu_strerror (err));
       return MU_DL_EX_ERROR;
     }
 
@@ -182,7 +182,7 @@ main (int argc, char *argv[])
 
   if (debug && err)
     fprintf (stderr, _("%s %s failed: %s\n"),
-	     unlock ? _("unlocking") : _("locking"), file, mu_errstring (err));
+	     unlock ? _("unlocking") : _("locking"), file, mu_strerror (err));
 
   switch (err)
     {
diff --git a/examples/http.c b/examples/http.c
index 12da270bc..0b93c09ab 100644
--- a/examples/http.c
+++ b/examples/http.c
@@ -41,7 +41,7 @@ main ()
   ret = tcp_stream_create (&stream, "www.gnu.org", 80, MU_STREAM_NONBLOCK);
   if (ret != 0)
     {
-      mu_error ( "tcp_stream_create: %s\n", mu_errstring (ret));
+      mu_error ( "tcp_stream_create: %s\n", mu_strerror (ret));
       exit (EXIT_FAILURE);
     }
 
@@ -54,7 +54,7 @@ connect_again:
           ret = stream_get_fd (stream, &fd);
           if (ret != 0)
             {
-              mu_error ( "stream_get_fd: %s\n", mu_errstring (ret));
+              mu_error ( "stream_get_fd: %s\n", mu_strerror (ret));
               exit (EXIT_FAILURE);
             }
           FD_ZERO (&fds);
@@ -62,14 +62,14 @@ connect_again:
           select (fd + 1, NULL, &fds, NULL, NULL);
           goto connect_again;
         }
-      mu_error ( "stream_open: %s\n", mu_errstring (ret));
+      mu_error ( "stream_open: %s\n", mu_strerror (ret));
       exit (EXIT_FAILURE);
     }
 
   ret = stream_get_fd (stream, &fd);
   if (ret != 0)
     {
-      mu_error ( "stream_get_fd: %s\n", mu_errstring (ret));
+      mu_error ( "stream_get_fd: %s\n", mu_strerror (ret));
       exit (EXIT_FAILURE);
     }
 
@@ -85,7 +85,7 @@ write_again:
           off += nb;
           goto write_again;
         }
-      mu_error ( "stream_write: %s\n", mu_errstring (ret));
+      mu_error ( "stream_write: %s\n", mu_strerror (ret));
       exit (EXIT_FAILURE);
     }
 
@@ -108,7 +108,7 @@ write_again:
             }
           else
             {
-              mu_error ( "stream_read: %s\n", mu_errstring (ret));
+              mu_error ( "stream_read: %s\n", mu_strerror (ret));
               exit (EXIT_FAILURE);
             }
         }
@@ -119,7 +119,7 @@ write_again:
   ret = stream_close (stream);
   if (ret != 0)
     {
-      mu_error ( "stream_close: %s\n", mu_errstring (ret));
+      mu_error ( "stream_close: %s\n", mu_strerror (ret));
       exit (EXIT_FAILURE);
     }
 
diff --git a/examples/mimetest.c b/examples/mimetest.c
index 174f2f059..363ba5046 100644
--- a/examples/mimetest.c
+++ b/examples/mimetest.c
@@ -92,7 +92,7 @@ main (int argc, char **argv)
 
   if ((ret = mailbox_create_default (&mbox, mailbox_name)) != 0)
     {
-      fprintf (stderr, "could not create - %s\n", mu_errstring (ret));
+      fprintf (stderr, "could not create - %s\n", mu_strerror (ret));
       exit (2);
     }
 
@@ -107,7 +107,7 @@ main (int argc, char **argv)
   /* Open the mailbox for reading only.  */
   if ((ret = mailbox_open (mbox, MU_STREAM_RDWR)) != 0)
     {
-      fprintf (stderr, "mailbox open - %s\n", mu_errstring (ret));
+      fprintf (stderr, "mailbox open - %s\n", mu_strerror (ret));
       exit (2);
     }
 
@@ -123,17 +123,17 @@ main (int argc, char **argv)
 
       if ((ret = mailbox_get_message (mbox, i, &msg)) != 0)
         {
-          fprintf (stderr, "mailbox_get_message - %s\n", mu_errstring (ret));
+          fprintf (stderr, "mailbox_get_message - %s\n", mu_strerror (ret));
           exit (2);
         }
       if ((ret = message_size (msg, &msize)) != 0)
         {
-          fprintf (stderr, "message_size - %s\n", mu_errstring (ret));
+          fprintf (stderr, "message_size - %s\n", mu_strerror (ret));
           exit (2);
         }
       if ((ret = message_get_header (msg, &hdr)) != 0)
         {
-          fprintf (stderr, "message_get_header - %s\n", mu_errstring (ret));
+          fprintf (stderr, "message_get_header - %s\n", mu_strerror (ret));
           exit (2);
         }
       header_get_value (hdr, MU_HEADER_FROM, from, sizeof (from), NULL);
@@ -145,7 +145,7 @@ main (int argc, char **argv)
 
       if ((ret = message_get_num_parts (msg, &nparts)) != 0)
         {
-          fprintf (stderr, "message_get_num_parts - %s\n", mu_errstring (ret));
+          fprintf (stderr, "message_get_num_parts - %s\n", mu_strerror (ret));
           exit (2);
         }
       printf ("Number of parts in message - %lu\n",
@@ -178,7 +178,7 @@ message_display_parts (message_t msg, int indent)
   /* How many parts does the message has? */
   if ((ret = message_get_num_parts (msg, &nparts)) != 0)
     {
-      fprintf (stderr, "message_get_num_parts - %s\n", mu_errstring (ret));
+      fprintf (stderr, "message_get_num_parts - %s\n", mu_strerror (ret));
       exit (2);
     }
 
@@ -189,17 +189,17 @@ message_display_parts (message_t msg, int indent)
     {
       if ((ret = message_get_part (msg, j, &part)) != 0)
         {
-          fprintf (stderr, "mime_get_part - %s\n", mu_errstring (ret));
+          fprintf (stderr, "mime_get_part - %s\n", mu_strerror (ret));
           exit (2);
         }
       if ((ret = message_size (part, &msize)) != 0)
         {
-          fprintf (stderr, "message_size - %s\n", mu_errstring (ret));
+          fprintf (stderr, "message_size - %s\n", mu_strerror (ret));
           exit (2);
         }
       if ((ret = message_get_header (part, &hdr)) != 0)
         {
-          fprintf (stderr, "message_get_header - %s\n", mu_errstring (ret));
+          fprintf (stderr, "message_get_header - %s\n", mu_strerror (ret));
           exit (2);
         }
       header_get_value (hdr, MU_HEADER_CONTENT_TYPE, type, sizeof (type),
@@ -220,13 +220,13 @@ message_display_parts (message_t msg, int indent)
               ret = message_unencapsulate (part, &part, NULL);
               if (ret != 0)
                 fprintf (stderr, "message_unencapsulate - %s\n",
-                         mu_errstring (ret));
+                         mu_strerror (ret));
               break;
             }
           if ((ret = message_get_header (part, &hdr)) != 0)
             {
               fprintf (stderr, "message_get_header - %s\n",
-                       mu_errstring (ret));
+                       mu_strerror (ret));
               exit (2);
             }
           header_get_value (hdr, MU_HEADER_FROM, from, sizeof (from), NULL);
@@ -238,7 +238,7 @@ message_display_parts (message_t msg, int indent)
           if ((ret = message_get_num_parts (part, &nsubparts)) != 0)
             {
               fprintf (stderr, "mime_get_num_parts - %s\n",
-                       mu_errstring (ret));
+                       mu_strerror (ret));
               exit (2);
             }
           message_display_parts (part, indent+indent_level);
diff --git a/examples/msg-send.c b/examples/msg-send.c
index 87802fdf4..5371afbe6 100644
--- a/examples/msg-send.c
+++ b/examples/msg-send.c
@@ -36,7 +36,7 @@
 #define C(X) do {\
   int e;\
   if((e = X) != 0) { \
-       fprintf(stderr, "%s failed: %s\n", #X, mu_errstring(e)); \
+       fprintf(stderr, "%s failed: %s\n", #X, mu_strerror(e)); \
        exit(1);\
   }\
 } while (0)
diff --git a/examples/mta.c b/examples/mta.c
index f52b7df8f..d5b3a5957 100644
--- a/examples/mta.c
+++ b/examples/mta.c
@@ -159,7 +159,7 @@ main (int argc, char **argv)
   if ((status = header_create (&header, NULL, 0, NULL)) != 0)
     {
       mu_error ("%s: can't create header: %s",
-		progname, mu_errstring (status));
+		progname, mu_strerror (status));
       return 1;
     }
 
@@ -300,7 +300,7 @@ mta_send (message_t msg)
   if (c)
     {
       mu_error ("%s: address_to_string failure: %s",
-		progname, mu_errstring (c));
+		progname, mu_strerror (c));
       return 1;
     }
   value = malloc (n + 1);
@@ -409,7 +409,7 @@ message_finalize (message_t msg, int warn)
       if (c)
 	{
 	  mu_error ("%s: address_to_string failure: %s",
-		    progname, mu_errstring (c));
+		    progname, mu_strerror (c));
 	  return 1;
 	}
       value = malloc (n + 1);
@@ -447,7 +447,7 @@ mta_stdin (int argc, char **argv)
   if ((c = mailbox_create_default (&mbox, tempfile)) != 0)
     {
       mu_error ("%s: can't create mailbox %s: %s",
-		progname, tempfile, mu_errstring (c));
+		progname, tempfile, mu_strerror (c));
       unlink (tempfile);
       return 1;
     }
@@ -455,7 +455,7 @@ mta_stdin (int argc, char **argv)
   if ((c = mailbox_open (mbox, MU_STREAM_RDWR)) != 0)
     {
       mu_error ("%s: can't open mailbox %s: %s",
-		progname, tempfile, mu_errstring (c));
+		progname, tempfile, mu_strerror (c));
       unlink (tempfile);
       return 1;
     }
@@ -660,7 +660,7 @@ smtp (int fd)
 		{
 		  mu_error ("%s: can't create mailbox %s: %s",
 			    progname,
-			    tempfile, mu_errstring (c));
+			    tempfile, mu_strerror (c));
 		  unlink (tempfile);
 		  exit (1);
 		}
@@ -669,7 +669,7 @@ smtp (int fd)
 		{
 		  mu_error ("%s: can't open mailbox %s: %s",
 			    progname, 
-			    tempfile, mu_errstring (c));
+			    tempfile, mu_strerror (c));
 		  unlink (tempfile);
 		  exit (1);
 		}
diff --git a/examples/sfrom.c b/examples/sfrom.c
index b07f70727..47c8517a4 100644
--- a/examples/sfrom.c
+++ b/examples/sfrom.c
@@ -45,14 +45,14 @@ main (int argc, const char **argv)
 
   if (status != 0)
     {
-      fprintf (stderr, "mailbox_create: %s\n", mu_errstring (status));
+      fprintf (stderr, "mailbox_create: %s\n", mu_strerror (status));
       exit (EXIT_FAILURE);
     }
 
   status = mailbox_open (mbox, MU_STREAM_READ);
   if (status != 0)
     {
-      fprintf (stderr, "mailbox_open: %s\n", mu_errstring (status));
+      fprintf (stderr, "mailbox_open: %s\n", mu_strerror (status));
       exit (EXIT_FAILURE);
     }
 
@@ -67,7 +67,7 @@ main (int argc, const char **argv)
           || (status = message_get_header (msg, &hdr)) != 0)
         {
           fprintf (stderr, "Error message: %s\n",
-                   mu_errstring (status));
+                   mu_strerror (status));
           exit (EXIT_FAILURE);
         }
 
diff --git a/examples/url-parse.c b/examples/url-parse.c
index 2377ba2ee..58d0d3124 100644
--- a/examples/url-parse.c
+++ b/examples/url-parse.c
@@ -39,13 +39,13 @@ main ()
       if ((rc = url_create (&u, str)) != 0)
         {
           fprintf (stderr, "url_create %s ERROR: [%d] %s",
-                   str, rc, mu_errstring (rc));
+                   str, rc, mu_strerror (rc));
           exit (1);
         }
       if ((rc = url_parse (u)) != 0)
         {
           printf ("%s => FAILED: [%d] %s\n",
-                  str, rc, mu_errstring (rc));
+                  str, rc, mu_strerror (rc));
           continue;
         }
       printf ("%s => SUCCESS\n", str);
diff --git a/frm/frm.c b/frm/frm.c
index 87994a385..7d9291be6 100644
--- a/frm/frm.c
+++ b/frm/frm.c
@@ -337,7 +337,7 @@ main(int argc, char **argv)
       {
 	fprintf (stderr, _("could not create mailbox <%s>: %s\n"),
 	    mailbox_name ? mailbox_name : _("default"),
-	    mu_errstring(status));
+	    mu_strerror(status));
 	exit (3);
       }
 
@@ -361,7 +361,7 @@ main(int argc, char **argv)
 	  {
 	    fprintf (stderr, _("could not open mailbox %s: %s\n"),
 		     url_to_string (url),
-		     mu_errstring(status));
+		     mu_strerror(status));
 	    
 	    goto cleanup;
 	  }
@@ -384,7 +384,7 @@ main(int argc, char **argv)
 	mailbox_get_url (mbox, &url);
 	fprintf (stderr, _("could not scan mailbox <%s>: %s\n"),
 		 url_to_string (url),
-		 mu_errstring(status));
+		 mu_strerror(status));
 	goto cleanup;
       }
 
diff --git a/from/from.c b/from/from.c
index 5f43a3a99..136ece8cc 100644
--- a/from/from.c
+++ b/from/from.c
@@ -121,7 +121,7 @@ main(int argc, char **argv)
     {
       fprintf (stderr, _("opening %s failed: %s\n"),
 	  mailbox_name,
-	  mu_errstring (status)
+	  mu_strerror (status)
 	  );
       exit (1);
     }
@@ -138,7 +138,7 @@ main(int argc, char **argv)
     {
       fprintf (stderr, _("opening %s failed: %s\n"),
 	  mailbox_name,
-	  mu_errstring (status)
+	  mu_strerror (status)
 	  );
       exit (1);
     }
@@ -152,7 +152,7 @@ main(int argc, char **argv)
       if ((status = mailbox_get_message (mbox, i, &msg)) != 0
 	  || (status = message_get_header (msg, &hdr)) != 0)
 	{
-	  fprintf (stderr, _("msg %d : %s\n"), i, mu_errstring(status));
+	  fprintf (stderr, _("msg %d : %s\n"), i, mu_strerror(status));
 	  exit(2);
 	}
 
diff --git a/guimb/collect.c b/guimb/collect.c
index 6a5eda8b3..7dff23d24 100644
--- a/guimb/collect.c
+++ b/guimb/collect.c
@@ -39,7 +39,7 @@ collect_open_default ()
       || mailbox_open (mbox, MU_STREAM_RDWR) != 0)
     {
       util_error (_("can't open default mailbox %s: %s"),
-		  default_mailbox, mu_errstring (errno));
+		  default_mailbox, mu_strerror (errno));
       exit (1);
     }
 
diff --git a/imap4d/auth_gsasl.c b/imap4d/auth_gsasl.c
index 9d87504f3..80100f970 100644
--- a/imap4d/auth_gsasl.c
+++ b/imap4d/auth_gsasl.c
@@ -31,7 +31,7 @@ create_gsasl_stream (stream_t *newstr, stream_t str, int flags)
   if (rc)
     {
       syslog (LOG_ERR, _("cannot create SASL stream: %s"),
-	      mu_errstring (rc));
+	      mu_strerror (rc));
       return RESP_NO;
     }
 
@@ -39,7 +39,7 @@ create_gsasl_stream (stream_t *newstr, stream_t str, int flags)
     {
       char *p;
       if (stream_strerror (*newstr, &p))
-	p = mu_errstring (rc);
+	p = mu_strerror (rc);
       syslog (LOG_ERR, _("cannot open SASL input stream: %s"), p);
       return RESP_NO;
     }
diff --git a/imap4d/select.c b/imap4d/select.c
index 94f09eced..46c828bbe 100644
--- a/imap4d/select.c
+++ b/imap4d/select.c
@@ -74,7 +74,7 @@ imap4d_select0 (struct imap4d_command *command, char *arg, int flags)
 	}
     }
   status = util_finish (command, RESP_NO, "Couldn't open %s, %s",
-			mailbox_name, mu_errstring (status));
+			mailbox_name, mu_strerror (status));
   free (mailbox_name);
   return status;
 }
diff --git a/include/mailutils/errno.h b/include/mailutils/errno.h
index 1234f2c09..6b805de48 100644
--- a/include/mailutils/errno.h
+++ b/include/mailutils/errno.h
@@ -65,7 +65,7 @@ extern "C" {
 #define MU_ERR_TCP_NO_PORT          (MU_ERR_BASE | 0x019)
 
 const char* mu_errname __P((int e));
-const char* mu_errstring __P((int e));
+const char* mu_strerror __P((int e));
 
 #ifdef __cplusplus
 }
diff --git a/libsieve/actions.c b/libsieve/actions.c
index e3d69327b..3a40c6ff8 100644
--- a/libsieve/actions.c
+++ b/libsieve/actions.c
@@ -71,7 +71,7 @@ sieve_action_fileinto (sieve_machine_t mach, list_t args, list_t tags)
 				val->v.string);
   if (rc)
     sieve_error (mach, _("fileinto: cannot save to mailbox: %s"),
-		 mu_errstring (rc));
+		 mu_strerror (rc));
   else
     sieve_mark_deleted (mach->msg, 1);    
   
@@ -254,7 +254,7 @@ sieve_action_reject (sieve_machine_t mach, list_t args, list_t tags)
       sieve_error (mach,
 		   _("%d: reject - can't create to address <%s>: %s\n"),
 		   sieve_get_message_num (mach),
-		   addrtext, mu_errstring (rc));
+		   addrtext, mu_strerror (rc));
       free (addrtext);
       goto end;
     }
@@ -267,7 +267,7 @@ sieve_action_reject (sieve_machine_t mach, list_t args, list_t tags)
 		   _("%d: reject - can't create from address <%s>: %s\n"),
 		   sieve_get_message_num (mach),
 		   sieve_get_daemon_email (mach),
-		   mu_errstring (rc));
+		   mu_strerror (rc));
       goto end;
     }
   
@@ -281,7 +281,7 @@ sieve_action_reject (sieve_machine_t mach, list_t args, list_t tags)
 		   _("%d: reject - can't open mailer %s: %s\n"),
 		   sieve_get_message_num (mach),
 		   url_to_string (url),
-		   mu_errstring (rc));
+		   mu_strerror (rc));
       goto end;
     }
 
@@ -363,7 +363,7 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags)
       sieve_error (mach,
 		   _("%d: redirect - parsing to `%s' failed: %s\n"),
 		   sieve_get_message_num (mach),
-		   val->v.string, mu_errstring (rc));
+		   val->v.string, mu_strerror (rc));
       return 1;
     }
   
@@ -384,7 +384,7 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags)
     {
       sieve_error (mach,
 		   _("%d: redirect - can't get envelope sender: %s\n"),
-		   sieve_get_message_num (mach), mu_errstring (rc));
+		   sieve_get_message_num (mach), mu_strerror (rc));
       goto end;
     }
 
@@ -394,7 +394,7 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags)
       sieve_error (mach,
 		   _("%d: redirect - can't create from address <%s>: %s\n"),
 		   sieve_get_message_num (mach),
-		   fromaddr, mu_errstring (rc));
+		   fromaddr, mu_strerror (rc));
       free (fromaddr);
       goto end;
     }
@@ -406,7 +406,7 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags)
     {
       sieve_error (mach, _("%d: can't copy message: %s"),
 		   sieve_get_message_num (mach),
-		   mu_errstring (rc));
+		   mu_strerror (rc));
       goto end;
     }
   
@@ -434,7 +434,7 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags)
 		   _("%d: redirect - can't open mailer %s: %s\n"),
 		   sieve_get_message_num (mach),
 		   url_to_string (url),
-		   mu_errstring (rc));
+		   mu_strerror (rc));
       goto end;
     }
   
diff --git a/libsieve/argp.c b/libsieve/argp.c
index d5d99fee3..de5e52425 100644
--- a/libsieve/argp.c
+++ b/libsieve/argp.c
@@ -87,7 +87,7 @@ sieve_argp_parser (int key, char *arg, struct argp_state *state)
 	  if (rc)
 	    {
 	      argp_error (state, "can't create list: %s",
-			mu_errstring (rc));
+			mu_strerror (rc));
 	      exit (1);
 	    }
 	}
diff --git a/libsieve/prog.c b/libsieve/prog.c
index e6367c85b..5400b9716 100644
--- a/libsieve/prog.c
+++ b/libsieve/prog.c
@@ -155,7 +155,7 @@ sieve_code_command (sieve_register_t *reg, list_t arglist)
 	{
 	  sieve_compile_error (sieve_filename, sieve_line_num,
                                _("can't create iterator: %s"),
-  		               mu_errstring (rc));
+  		               mu_strerror (rc));
 	  return 1;
 	}
   
@@ -183,7 +183,7 @@ sieve_code_command (sieve_register_t *reg, list_t arglist)
 		{
 		  sieve_compile_error (sieve_filename, sieve_line_num,
                                        _("%s:%d: can't create tag list: %s"),
-			               mu_errstring (rc));
+			               mu_strerror (rc));
 		  err = 1;
 		  break;
 		}
@@ -207,7 +207,7 @@ sieve_code_command (sieve_register_t *reg, list_t arglist)
 		    {
 		      sieve_compile_error (sieve_filename, sieve_line_num,
 			  	         _("%s:%d: can't create check list: %s"),
-					   mu_errstring (rc));
+					   mu_strerror (rc));
 		      err = 1;
 		      break;
 		    }
@@ -255,7 +255,7 @@ sieve_code_command (sieve_register_t *reg, list_t arglist)
 		{
 		  sieve_compile_error (sieve_filename, sieve_line_num,
                                        _("can't create arg list: %s"),
-			               mu_errstring (rc));
+			               mu_strerror (rc));
 		  err = 1;
 		  break;
 		}
diff --git a/libsieve/require.c b/libsieve/require.c
index f9b87a5bb..f37efd1ce 100644
--- a/libsieve/require.c
+++ b/libsieve/require.c
@@ -36,7 +36,7 @@ sieve_require (list_t slist)
     {
       sieve_compile_error (sieve_filename, sieve_line_num,
                    _("cannot create iterator: %s"),
-		   mu_errstring (status));
+		   mu_strerror (status));
       return;
     }
 
diff --git a/libsieve/runtime.c b/libsieve/runtime.c
index d40be7c15..db1f041b2 100644
--- a/libsieve/runtime.c
+++ b/libsieve/runtime.c
@@ -314,7 +314,7 @@ sieve_mailbox (sieve_machine_t mach, mailbox_t mbox)
   mach->msgno = 0;
   rc = mailbox_scan (mbox, 1, &total);
   if (rc)
-    sieve_error (mach, _("mailbox_scan: %s"), mu_errstring (errno));
+    sieve_error (mach, _("mailbox_scan: %s"), mu_strerror (errno));
 
   observable_detach (observable, observer);
   observer_destroy (&observer, mach);
diff --git a/libsieve/sieve.l b/libsieve/sieve.l
index a7a9296db..ba6d05485 100644
--- a/libsieve/sieve.l
+++ b/libsieve/sieve.l
@@ -634,7 +634,7 @@ multiline_begin ()
   if (status)
     {
       sieve_compile_error (sieve_filename, sieve_line_num,
-                           "list_create: %s", mu_errstring (status));
+                           "list_create: %s", mu_strerror (status));
       exit (1);
     }
 
diff --git a/mail.local/main.c b/mail.local/main.c
index 574b40e8d..3a2d691b6 100644
--- a/mail.local/main.c
+++ b/mail.local/main.c
@@ -288,19 +288,19 @@ main (int argc, char *argv[])
       
       if ((rc = mu_debug_create (&mudebug, NULL)))
 	{
-	  mu_error (_("mu_debug_create failed: %s\n"), mu_errstring (rc));
+	  mu_error (_("mu_debug_create failed: %s\n"), mu_strerror (rc));
 	  exit (EX_TEMPFAIL);
 	}
       if ((rc = mu_debug_set_level (mudebug, debug_flags)))
 	{
 	  mu_error (_("mu_debug_set_level failed: %s\n"),
-		    mu_errstring (rc));
+		    mu_strerror (rc));
 	  exit (EX_TEMPFAIL);
 	}
       if ((rc = mu_debug_set_print (mudebug, _mu_debug_printer, NULL)))
 	{