unify variable names

All file descriptors variables now begin with `fd`.

diff --git a/conn/tunnel.c b/conn/tunnel.c
index 81521f33e3f59da8f8ccf9b30d4a97938ee7c339..b3e4686e58cadb7bef1eb7c639122088cd35782f 100644 (file)
--- a/conn/tunnel.c
+++ b/conn/tunnel.c
@@ -87,9 +87,9 @@ static int tunnel_socket_open(struct Connection *conn)
   if (pid == 0)
   {
     mutt_sig_unblock_system(false);
-    const int devnull = open("/dev/null", O_RDWR);
-    if ((devnull < 0) || (dup2(pout[0], STDIN_FILENO) < 0) ||
-        (dup2(pin[1], STDOUT_FILENO) < 0) || (dup2(devnull, STDERR_FILENO) < 0))
+    const int fd_null = open("/dev/null", O_RDWR);
+    if ((fd_null < 0) || (dup2(pout[0], STDIN_FILENO) < 0) ||
+        (dup2(pin[1], STDOUT_FILENO) < 0) || (dup2(fd_null, STDERR_FILENO) < 0))
     {
       _exit(127);
     }
@@ -97,7 +97,7 @@ static int tunnel_socket_open(struct Connection *conn)
     close(pin[1]);
     close(pout[0]);
     close(pout[1]);
-    close(devnull);
+    close(fd_null);
 
     /* Don't let the subprocess think it can use the controlling tty */
     setsid();

diff --git a/curs_lib.c b/curs_lib.c
index b65473cc9678ecb159b5b8f8c973a6762e894062..f2823859f56e8a658d25550df540f0b6e4911785 100644 (file)
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -531,27 +531,26 @@ int mutt_any_key_to_continue(const char *s)
 {
   struct termios t;
   struct termios old;
-  int f, ch;
 
-  f = open("/dev/tty", O_RDONLY);
-  if (f < 0)
+  int fd = open("/dev/tty", O_RDONLY);
+  if (fd < 0)
     return EOF;
-  tcgetattr(f, &t);
+  tcgetattr(fd, &t);
   memcpy((void *) &old, (void *) &t, sizeof(struct termios)); /* save original state */
   t.c_lflag &= ~(ICANON | ECHO);
   t.c_cc[VMIN] = 1;
   t.c_cc[VTIME] = 0;
-  tcsetattr(f, TCSADRAIN, &t);
+  tcsetattr(fd, TCSADRAIN, &t);
   fflush(stdout);
   if (s)
     fputs(s, stdout);
   else
     fputs(_("Press any key to continue..."), stdout);
   fflush(stdout);
-  ch = fgetc(stdin);
+  int ch = fgetc(stdin);
   fflush(stdin);
-  tcsetattr(f, TCSADRAIN, &old);
-  close(f);
+  tcsetattr(fd, TCSADRAIN, &old);
+  close(fd);
   fputs("\r\n", stdout);
   mutt_clear_error();
   return (ch >= 0) ? ch : EOF;

diff --git a/mbox/mbox.c b/mbox/mbox.c
index 82dc69ab82a24293df9c90803045b8a87729e3ec..6e5816c537f48bad61a42ec59d68e8325dd86c16 100644 (file)
--- a/mbox/mbox.c
+++ b/mbox/mbox.c
@@ -1178,12 +1178,12 @@ static int mbox_mbox_sync(struct Mailbox *m, int *index_hint)
 
   /* Create a temporary file to write the new version of the mailbox in. */
   mutt_mktemp(tempfile, sizeof(tempfile));
-  i = open(tempfile, O_WRONLY | O_EXCL | O_CREAT, 0600);
-  if ((i == -1) || !(fp = fdopen(i, "w")))
+  int fd = open(tempfile, O_WRONLY | O_EXCL | O_CREAT, 0600);
+  if ((fd == -1) || !(fp = fdopen(fd, "w")))
   {
-    if (-1 != i)
+    if (fd != -1)
     {
-      close(i);
+      close(fd);
       unlink(tempfile);
     }
     mutt_error(_("Could not create temporary file"));

diff --git a/mutt/file.c b/mutt/file.c
index 6b8a6224c2b402220b635e5b19e64eaf1eb8f6a4..ede1aa3958e39146e061ded3461741c456f6c699 100644 (file)
--- a/mutt/file.c
+++ b/mutt/file.c
@@ -1196,10 +1196,9 @@ int mutt_file_unlock(int fd)
  */
 void mutt_file_unlink_empty(const char *path)
 {
-  int fd;
   struct stat sb;
 
-  fd = open(path, O_RDWR);
+  int fd = open(path, O_RDWR);
   if (fd == -1)
     return;
 

diff --git a/mutt_attach.c b/mutt_attach.c
index 37772dc4ce74e548ea99079fb676444b40da1fd9..c4c96136362573a240fc743e73afde848ffcfb9c 100644 (file)
--- a/mutt_attach.c
+++ b/mutt_attach.c
@@ -485,7 +485,7 @@ int mutt_view_attachment(FILE *fp, struct Body *a, enum ViewAttachMode mode,
   if (use_mailcap)
   {
     pid_t pid = 0;
-    int tempfd = -1, pagerfd = -1;
+    int fd_temp = -1, fd_pager = -1;
 
     if (!use_pager)
       mutt_endwin();
@@ -493,28 +493,28 @@ int mutt_view_attachment(FILE *fp, struct Body *a, enum ViewAttachMode mode,
     if (use_pager || use_pipe)
     {
       if (use_pager &&
-          ((pagerfd = mutt_file_open(pagerfile, O_CREAT | O_EXCL | O_WRONLY)) == -1))
+          ((fd_pager = mutt_file_open(pagerfile, O_CREAT | O_EXCL | O_WRONLY)) == -1))
       {
         mutt_perror("open");
         goto return_error;
       }
-      if (use_pipe && ((tempfd = open(tempfile, 0)) == -1))
+      if (use_pipe && ((fd_temp = open(tempfile, 0)) == -1))
       {
-        if (pagerfd != -1)
-          close(pagerfd);
+        if (fd_pager != -1)
+          close(fd_pager);
         mutt_perror("open");
         goto return_error;
       }
 
-      pid = mutt_create_filter_fd(cmd, NULL, NULL, NULL, use_pipe ? tempfd : -1,
-                                  use_pager ? pagerfd : -1, -1);
+      pid = mutt_create_filter_fd(cmd, NULL, NULL, NULL, use_pipe ? fd_temp : -1,
+                                  use_pager ? fd_pager : -1, -1);
       if (pid == -1)
       {
-        if (pagerfd != -1)
-          close(pagerfd);
+        if (fd_pager != -1)
+          close(fd_pager);
 
-        if (tempfd != -1)
-          close(tempfd);
+        if (fd_temp != -1)
+          close(fd_temp);
 
         mutt_error(_("Can't create filter"));
         goto return_error;
@@ -536,10 +536,10 @@ int mutt_view_attachment(FILE *fp, struct Body *a, enum ViewAttachMode mode,
       if ((mutt_wait_filter(pid) || (entry->needsterminal && C_WaitKey)) && !use_pager)
         mutt_any_key_to_continue(NULL);
 
-      if (tempfd != -1)
-        close(tempfd);
-      if (pagerfd != -1)
-        close(pagerfd);
+      if (fd_temp != -1)
+        close(fd_temp);
+      if (fd_pager != -1)
+        close(fd_pager);
     }
     else
     {

diff --git a/ncrypt/gnupgparse.c b/ncrypt/gnupgparse.c
index f390a7c191c79812fca7a28a0bad066eca9fec83..57f5bccb1e8102506e9805d7260bc6fd473bb374 100644 (file)
--- a/ncrypt/gnupgparse.c
+++ b/ncrypt/gnupgparse.c
@@ -415,18 +415,17 @@ struct PgpKeyInfo *pgp_get_candidates(enum PgpRing keyring, struct ListHead *hin
   char buf[1024];
   struct PgpKeyInfo *db = NULL, **kend = NULL, *k = NULL, *kk = NULL, *mainkey = NULL;
   bool is_sub = false;
-  int devnull;
 
-  devnull = open("/dev/null", O_RDWR);
-  if (devnull == -1)
+  int fd_null = open("/dev/null", O_RDWR);
+  if (fd_null == -1)
     return NULL;
 
   mutt_str_replace(&chs, C_Charset);
 
-  pid = pgp_invoke_list_keys(NULL, &fp, NULL, -1, -1, devnull, keyring, hints);
+  pid = pgp_invoke_list_keys(NULL, &fp, NULL, -1, -1, fd_null, keyring, hints);
   if (pid == -1)
   {
-    close(devnull);
+    close(fd_null);
     return NULL;
   }
 
@@ -467,7 +466,7 @@ struct PgpKeyInfo *pgp_get_candidates(enum PgpRing keyring, struct ListHead *hin
   mutt_file_fclose(&fp);
   mutt_wait_filter(pid);
 
-  close(devnull);
+  close(fd_null);
 
   return db;
 }

diff --git a/ncrypt/pgpinvoke.c b/ncrypt/pgpinvoke.c
index 0120bcfe66cdbb6e937ff0049389bfc2fe7f3dbb..dbeabb44054078bcdacdfd0ab65156e1e680b482 100644 (file)
--- a/ncrypt/pgpinvoke.c
+++ b/ncrypt/pgpinvoke.c
@@ -425,7 +425,6 @@ void pgp_class_invoke_getkeys(struct Address *addr)
   char buf[PATH_MAX];
   char tmp[1024];
   char cmd[STR_COMMAND];
-  int devnull;
 
   char *personal = NULL;
 
@@ -448,7 +447,7 @@ void pgp_class_invoke_getkeys(struct Address *addr)
 
   mutt_pgp_command(cmd, sizeof(cmd), &cctx, C_PgpGetkeysCommand);
 
-  devnull = open("/dev/null", O_RDWR);
+  int fd_null = open("/dev/null", O_RDWR);
 
   if (!isendwin())
     mutt_message(_("Fetching PGP key..."));
@@ -459,8 +458,8 @@ void pgp_class_invoke_getkeys(struct Address *addr)
   if (!isendwin())
     mutt_clear_error();
 
-  if (devnull >= 0)
-    close(devnull);
+  if (fd_null >= 0)
+    close(fd_null);
 }
 
 /**

diff --git a/remailer.c b/remailer.c
index 6aa24745861a9d61f19f40016a88422b2a455fbb..e803d9bbceaa298dc1ef6ae4432f75fbe2a8dbfa 100644 (file)
--- a/remailer.c
+++ b/remailer.c
@@ -160,7 +160,6 @@ static struct Remailer **mix_type2_list(size_t *l)
 {
   FILE *fp = NULL;
   pid_t mm_pid;
-  int devnull;
 
   char cmd[STR_COMMAND];
   char line[8192];
@@ -172,16 +171,16 @@ static struct Remailer **mix_type2_list(size_t *l)
   if (!l)
     return NULL;
 
-  devnull = open("/dev/null", O_RDWR);
-  if (devnull == -1)
+  int fd_null = open("/dev/null", O_RDWR);
+  if (fd_null == -1)
     return NULL;
 
   snprintf(cmd, sizeof(cmd), "%s -T", C_Mixmaster);
 
-  mm_pid = mutt_create_filter_fd(cmd, NULL, &fp, NULL, devnull, -1, devnull);
+  mm_pid = mutt_create_filter_fd(cmd, NULL, &fp, NULL, fd_null, -1, fd_null);
   if (mm_pid == -1)
   {
-    close(devnull);
+    close(fd_null);
     return NULL;
   }
 
@@ -235,7 +234,7 @@ static struct Remailer **mix_type2_list(size_t *l)
   mix_add_entry(&type2_list, NULL, &slots, &used);
   mutt_wait_filter(mm_pid);
 
-  close(devnull);
+  close(fd_null);
 
   return type2_list;
 }