Replace `new` variable with`new_file`

`new` is a reserved keyword in c++

Rename both `new` and `old` to `new_file` and `old_file` for consistency

diff --git a/mutt_logging.c b/mutt_logging.c
index fe45f87cbe0308aacd658c0e2afe9b809301815f..8ffdf60c6d302f440ed618bd8eff4a99cff10472 100644 (file)
--- a/mutt_logging.c
+++ b/mutt_logging.c
@@ -118,21 +118,21 @@ static const char *rotate_logs(const char *file, int count)
   if (!file)
     return NULL;
 
-  char old[PATH_MAX];
-  char new[PATH_MAX];
+  char old_file[PATH_MAX];
+  char new_file[PATH_MAX];
 
   /* rotate the old debug logs */
   for (count -= 2; count >= 0; count--)
   {
-    snprintf(old, sizeof(old), "%s%d", file, count);
-    snprintf(new, sizeof(new), "%s%d", file, count + 1);
+    snprintf(old_file, sizeof(old_file), "%s%d", file, count);
+    snprintf(new_file, sizeof(new_file), "%s%d", file, count + 1);
 
-    mutt_expand_path(old, sizeof(old));
-    mutt_expand_path(new, sizeof(new));
-    rename(old, new);
+    mutt_expand_path(old_file, sizeof(old_file));
+    mutt_expand_path(new_file, sizeof(new_file));
+    rename(old_file, new_file);
   }
 
-  return mutt_str_strdup(old);
+  return mutt_str_strdup(old_file);
 }
 
 /**

diff --git a/notmuch/mutt_notmuch.c b/notmuch/mutt_notmuch.c
index 554baf62eb8ee4e38b54460ead5ae4e0dea58470..0ec9db94b856a68d18096aa1807386c90fddb4ab 100644 (file)
--- a/notmuch/mutt_notmuch.c
+++ b/notmuch/mutt_notmuch.c
@@ -1490,22 +1490,22 @@ static int remove_filename(struct Mailbox *m, const char *path)
 
 /**
  * rename_filename - Rename the file
- * @param m   Notmuch Mailbox data
- * @param old Old filename
- * @param new New filename
- * @param e   Email
- * @retval  0 Success
- * @retval -1 Failure
+ * @param m        Notmuch Mailbox data
+ * @param old_file Old filename
+ * @param new_file New filename
+ * @param e        Email
+ * @retval  0      Success
+ * @retval -1      Failure
  */
-static int rename_filename(struct Mailbox *m, const char *old, const char *new,
-                           struct Email *e)
+static int rename_filename(struct Mailbox *m, const char *old_file,
+                           const char *new_file, struct Email *e)
 {
   struct NmMboxData *mdata = nm_mdata_get(m);
   if (!mdata)
     return -1;
 
   notmuch_database_t *db = nm_db_get(m, true);
-  if (!db || !new || !old || (access(new, F_OK) != 0))
+  if (!db || !new_file || !old_file || (access(new_file, F_OK) != 0))
     return -1;
 
   int rc = -1;
@@ -1513,26 +1513,26 @@ static int rename_filename(struct Mailbox *m, const char *old, const char *new,
   notmuch_filenames_t *ls = NULL;
   notmuch_message_t *msg = NULL;
 
-  mutt_debug(LL_DEBUG1, "nm: rename filename, %s -> %s\n", old, new);
+  mutt_debug(LL_DEBUG1, "nm: rename filename, %s -> %s\n", old_file, new_file);
   int trans = nm_db_trans_begin(m);
   if (trans < 0)
     return -1;
 
-  mutt_debug(LL_DEBUG2, "nm: rename: add '%s'\n", new);
+  mutt_debug(LL_DEBUG2, "nm: rename: add '%s'\n", new_file);
 #ifdef HAVE_NOTMUCH_DATABASE_INDEX_FILE
-  st = notmuch_database_index_file(db, new, NULL, &msg);
+  st = notmuch_database_index_file(db, new_file, NULL, &msg);
 #else
-  st = notmuch_database_add_message(db, new, &msg);
+  st = notmuch_database_add_message(db, new_file, &msg);
 #endif
 
   if ((st != NOTMUCH_STATUS_SUCCESS) && (st != NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID))
   {
-    mutt_debug(LL_DEBUG1, "nm: failed to add '%s' [st=%d]\n", new, (int) st);
+    mutt_debug(LL_DEBUG1, "nm: failed to add '%s' [st=%d]\n", new_file, (int) st);
     goto done;
   }
 
-  mutt_debug(LL_DEBUG2, "nm: rename: rem '%s'\n", old);
-  st = notmuch_database_remove_message(db, old);
+  mutt_debug(LL_DEBUG2, "nm: rename: rem '%s'\n", old_file);
+  st = notmuch_database_remove_message(db, old_file);
   switch (st)
   {
     case NOTMUCH_STATUS_SUCCESS:
@@ -1541,7 +1541,7 @@ static int rename_filename(struct Mailbox *m, const char *old, const char *new,
       mutt_debug(LL_DEBUG2, "nm: rename: syncing duplicate filename\n");
       notmuch_message_destroy(msg);
       msg = NULL;
-      notmuch_database_find_message_by_filename(db, new, &msg);
+      notmuch_database_find_message_by_filename(db, new_file, &msg);
 
       for (ls = notmuch_message_get_filenames(msg);
            msg && ls && notmuch_filenames_valid(ls); notmuch_filenames_move_to_next(ls))
@@ -1549,7 +1549,7 @@ static int rename_filename(struct Mailbox *m, const char *old, const char *new,
         const char *path = notmuch_filenames_get(ls);
         char newpath[PATH_MAX];
 
-        if (strcmp(new, path) == 0)
+        if (strcmp(new_file, path) == 0)
           continue;
 
         mutt_debug(LL_DEBUG2, "nm: rename: syncing duplicate: %s\n", path);
@@ -1567,11 +1567,11 @@ static int rename_filename(struct Mailbox *m, const char *old, const char *new,
       }
       notmuch_message_destroy(msg);
       msg = NULL;
-      notmuch_database_find_message_by_filename(db, new, &msg);
+      notmuch_database_find_message_by_filename(db, new_file, &msg);
       st = NOTMUCH_STATUS_SUCCESS;
       break;
     default:
-      mutt_debug(LL_DEBUG1, "nm: failed to remove '%s' [st=%d]\n", old, (int) st);
+      mutt_debug(LL_DEBUG1, "nm: failed to remove '%s' [st=%d]\n", old_file, (int) st);
       break;
   }
 
@@ -1885,27 +1885,28 @@ bool nm_message_is_still_queried(struct Mailbox *m, struct Email *e)
 
 /**
  * nm_update_filename - Change the filename
- * @param m   Mailbox
- * @param old Old filename
- * @param new New filename
- * @param e   Email
- * @retval  0 Success
- * @retval -1 Failure
+ * @param m        Mailbox
+ * @param old_file Old filename
+ * @param new_file New filename
+ * @param e        Email
+ * @retval  0      Success
+ * @retval -1      Failure
  */
-int nm_update_filename(struct Mailbox *m, const char *old, const char *new, struct Email *e)
+int nm_update_filename(struct Mailbox *m, const char *old_file,
+                       const char *new_file, struct Email *e)
 {
   char buf[PATH_MAX];
   struct NmMboxData *mdata = nm_mdata_get(m);
-  if (!mdata || !new)
+  if (!mdata || !new_file)
     return -1;
 
-  if (!old && e && e->edata)
+  if (!old_file && e && e->edata)
   {
     email_get_fullpath(e, buf, sizeof(buf));
-    old = buf;
+    old_file = buf;
   }
 
-  int rc = rename_filename(m, old, new, e);
+  int rc = rename_filename(m, old_file, new_file, e);
 
   nm_db_release(m);
   m->mtime.tv_sec = time(NULL);
@@ -2288,9 +2289,6 @@ static int nm_mbox_check(struct Mailbox *m, int *index_hint)
   for (int i = 0; notmuch_messages_valid(msgs) && ((limit == 0) || (i < limit));
        notmuch_messages_move_to_next(msgs), i++)
   {
-    char old[PATH_MAX];
-    const char *new = NULL;
-
     notmuch_message_t *msg = notmuch_messages_get(msgs);
     struct Email *e = get_mutt_email(m, msg);
 
@@ -2307,18 +2305,19 @@ static int nm_mbox_check(struct Mailbox *m, int *index_hint)
 
     /* Check to see if the message has moved to a different subdirectory.
      * If so, update the associated filename.  */
-    new = get_message_last_filename(msg);
-    email_get_fullpath(e, old, sizeof(old));
+    const char *new_file = get_message_last_filename(msg);
+    char old_file[PATH_MAX];
+    email_get_fullpath(e, old_file, sizeof(old_file));
 
-    if (mutt_str_strcmp(old, new) != 0)
-      update_message_path(e, new);
+    if (mutt_str_strcmp(old_file, new_file) != 0)
+      update_message_path(e, new_file);
 
     if (!e->changed)
     {
       /* if the user hasn't modified the flags on this message, update the
        * flags we just detected.  */
       struct Email tmp = { 0 };
-      maildir_parse_flags(&tmp, new);
+      maildir_parse_flags(&tmp, new_file);
       maildir_update_flags(m, e, &tmp);
     }
 
@@ -2389,24 +2388,24 @@ static int nm_mbox_sync(struct Mailbox *m, int *index_hint)
 
   for (int i = 0; i < m->msg_count; i++)
   {
-    char old[PATH_MAX], new[PATH_MAX];
+    char old_file[PATH_MAX], new_file[PATH_MAX];
     struct Email *e = m->emails[i];
     struct NmEmailData *edata = e->edata;
 
     if (!m->quiet)
       mutt_progress_update(&progress, i, -1);
 
-    *old = '\0';
-    *new = '\0';
+    *old_file = '\0';
+    *new_file = '\0';
 
     if (edata->oldpath)
     {
-      mutt_str_strfcpy(old, edata->oldpath, sizeof(old));
-      old[sizeof(old) - 1] = '\0';
-      mutt_debug(LL_DEBUG2, "nm: fixing obsolete path '%s'\n", old);
+      mutt_str_strfcpy(old_file, edata->oldpath, sizeof(old_file));
+      old_file[sizeof(old_file) - 1] = '\0';
+      mutt_debug(LL_DEBUG2, "nm: fixing obsolete path '%s'\n", old_file);
     }
     else
-      email_get_fullpath(e, old, sizeof(old));
+      email_get_fullpath(e, old_file, sizeof(old_file));
 
     mutt_buffer_strcpy(m->pathbuf, edata->folder);
     m->magic = edata->magic;
@@ -2418,13 +2417,13 @@ static int nm_mbox_sync(struct Mailbox *m, int *index_hint)
       break;
 
     if (!e->deleted)
-      email_get_fullpath(e, new, sizeof(new));
+      email_get_fullpath(e, new_file, sizeof(new_file));
 
-    if (e->deleted || (strcmp(old, new) != 0))
+    if (e->deleted || (strcmp(old_file, new_file) != 0))
     {
-      if (e->deleted && (remove_filename(m, old) == 0))
+      if (e->deleted && (remove_filename(m, old_file) == 0))
         changed = true;
-      else if (*new &&*old && (rename_filename(m, old, new, e) == 0))
+      else if (*new_file && *old_file && (rename_filename(m, old_file, new_file, e) == 0))
         changed = true;
     }
 

diff --git a/notmuch/mutt_notmuch.h b/notmuch/mutt_notmuch.h
index 514757e15b485ad113f90149d6c0b19af440f246..28c6d0894c7f94430e726420f520a2571fd13625 100644 (file)
--- a/notmuch/mutt_notmuch.h
+++ b/notmuch/mutt_notmuch.h
@@ -71,7 +71,7 @@ void  nm_query_window_backward   (void);
 void  nm_query_window_forward    (void);
 int   nm_read_entire_thread      (struct Mailbox *m, struct Email *e);
 int   nm_record_message          (struct Mailbox *m, char *path, struct Email *e);
-int   nm_update_filename         (struct Mailbox *m, const char *old, const char *new, struct Email *e);
+int   nm_update_filename         (struct Mailbox *m, const char *old_file, const char *new_file, struct Email *e);
 char *nm_uri_from_query          (struct Mailbox *m, char *buf, size_t buflen);
 
 #endif /* MUTT_NOTMUCH_MUTT_NOTMUCH_H */