# HG changeset patch
# User Damien Riegel <[email protected]>
# Date 1465337967 14400
#      Tue Jun 07 18:19:27 2016 -0400
# Node ID 319e4981a91dea92024dd450a8e3c4822048d468
# Parent  c1df0f24917c001eadbfbf12b736f4c1aea70a5e
prepend maildir_commit_message function name with an underscore

Basically, rename maildir_commit_message to _maildir_commit_message.
This commit is preparatory to make the maildir_commit_message symbol
available for further use.

Symbols starting with underscore should be avoided but this one is long
enough to prevent collision.

diff -r c1df0f24917c -r 319e4981a91d mh.c
--- a/mh.c      Wed Jun 01 20:37:31 2016 -0400
+++ b/mh.c      Tue Jun 07 18:19:27 2016 -0400
@@ -1455,7 +1455,7 @@
  * 
  */
 
-int maildir_commit_message (CONTEXT * ctx, MESSAGE * msg, HEADER * hdr)
+int _maildir_commit_message (CONTEXT * ctx, MESSAGE * msg, HEADER * hdr)
 {
   char subdir[4];
   char suffix[16];
@@ -1487,7 +1487,7 @@
              NONULL (Hostname), suffix);
     snprintf (full, _POSIX_PATH_MAX, "%s/%s", ctx->path, path);
 
-    dprint (2, (debugfile, "maildir_commit_message (): renaming %s to %s.\n",
+    dprint (2, (debugfile, "_maildir_commit_message (): renaming %s to %s.\n",
                msg->path, full));
 
     if (safe_rename (msg->path, full) == 0)
@@ -1510,7 +1510,7 @@
        ut.modtime = msg->received;
        if (utime (full, &ut))
        {
-         mutt_perror (_("maildir_commit_message(): unable to set time on 
file"));
+         mutt_perror (_("_maildir_commit_message(): unable to set time on 
file"));
          return -1;
        }
       }
@@ -1643,7 +1643,7 @@
     strfcpy (partpath, h->path, _POSIX_PATH_MAX);
 
     if (ctx->magic == MUTT_MAILDIR)
-      rc = maildir_commit_message (ctx, dest, h);
+      rc = _maildir_commit_message (ctx, dest, h);
     else
       rc = _mh_commit_message (ctx, dest, h, 0);
 
diff -r c1df0f24917c -r 319e4981a91d mx.c
--- a/mx.c      Wed Jun 01 20:37:31 2016 -0400
+++ b/mx.c      Tue Jun 07 18:19:27 2016 -0400
@@ -1368,7 +1368,7 @@
     
     case MUTT_MAILDIR:
     {
-      r = maildir_commit_message (ctx, msg, NULL);
+      r = _maildir_commit_message (ctx, msg, NULL);
       break;
     }
     
diff -r c1df0f24917c -r 319e4981a91d mx.h
--- a/mx.h      Wed Jun 01 20:37:31 2016 -0400
+++ b/mx.h      Tue Jun 07 18:19:27 2016 -0400
@@ -60,7 +60,7 @@
 
 int maildir_check_empty (const char *);
 
-int maildir_commit_message (CONTEXT *, MESSAGE *, HEADER *);
+int _maildir_commit_message (CONTEXT *, MESSAGE *, HEADER *);
 int mh_commit_message (CONTEXT *, MESSAGE *);
 
 FILE *maildir_open_find_message (const char *, const char *);

Reply via email to