Remove the ispell stuff, it's useless, most editors know how to do this,

[apps/madmutt.git] / browser.c

diff --git a/browser.c b/browser.c
index f8fbb3d..aa91a60 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -65,9 +65,9 @@ static void destroy_state (struct browser_state *state)
   int c;
 
   for (c = 0; c < state->entrylen; c++) {
-    p_delete(&((state->entry)[c].name));
-    p_delete(&((state->entry)[c].desc));
-    p_delete(&((state->entry)[c].st));
+    p_delete(&state->entry[c].name);
+    p_delete(&state->entry[c].desc);
+    p_delete(&state->entry[c].st);
   }
   p_delete(&state->folder);
   p_delete(&state->entry);
@@ -145,11 +145,11 @@ static int link_is_dir (const char *folder, const char *path)
     return 0;
 }
 
-static const char *folder_format_str (char *dest, ssize_t destlen, char op,
-                                      const char *src, const char *fmt,
-                                      const char *ifstr,
-                                      const char *elstr,
-                                      anytype data, format_flag flags)
+static const char *
+folder_format_str(char *dest, ssize_t destlen, char op,
+                  const char *src, const char *fmt,
+                  const char *ifstr, const char *elstr,
+                  anytype data, format_flag flags)
 {
   char fn[STRING], tmp[STRING], permission[11], date[16];
   const char *t_fmt;
@@ -184,9 +184,9 @@ static const char *folder_format_str (char *dest, ssize_t destlen, char op,
       const char *s;
 
       if (folder->ff->imap)
-        s = NONULL (folder->ff->desc);
+        s = NONULL(folder->ff->desc);
       else
-        s = NONULL (folder->ff->name);
+        s = NONULL(folder->ff->name);
 
       snprintf (fn, sizeof (fn), "%s%s", s,
                 folder->ff->st ? (S_ISLNK (folder->ff->st->st_mode) ? "@" :
@@ -200,9 +200,8 @@ static const char *folder_format_str (char *dest, ssize_t destlen, char op,
   case 'F':
     if (folder->ff->st != NULL) {
       snprintf (permission, sizeof (permission), "%c%c%c%c%c%c%c%c%c%c",
-                S_ISDIR (folder->ff->st->
-                         st_mode) ? 'd' : (S_ISLNK (folder->ff->st->
-                                                    st_mode) ? 'l' : '-'),
+                S_ISDIR(folder->ff->st-> st_mode)
+                ? 'd' : (S_ISLNK(folder->ff->st-> st_mode) ? 'l' : '-'),
                 (folder->ff->st->st_mode & S_IRUSR) != 0 ? 'r' : '-',
                 (folder->ff->st->st_mode & S_IWUSR) != 0 ? 'w' : '-',
                 (folder->ff->st->st_mode & S_ISUID) !=
@@ -300,20 +299,20 @@ static const char *folder_format_str (char *dest, ssize_t destlen, char op,
     break;
   }
 
-  if (optional)
-    m_strformat (dest, destlen, ifstr, folder_format_str, data, 0);
-  else if (flags & M_FORMAT_OPTIONAL)
-    m_strformat (dest, destlen, elstr, folder_format_str, data, 0);
 
-  return (src);
+  if (flags & M_FORMAT_OPTIONAL)
+    m_strformat(dest, destlen, 0, optional ? ifstr : elstr,
+                folder_format_str, data, 0);
+
+  return src;
 }
 
 #ifdef USE_NNTP
-static const char *newsgroup_format_str (char *dest, ssize_t destlen, char op,
-                                         const char *src, const char *fmt,
-                                         const char *ifstr,
-                                         const char *elstr,
-                                         anytype data, format_flag flags)
+static const char *
+newsgroup_format_str(char *dest, ssize_t destlen, char op,
+                     const char *src, const char *fmt,
+                     const char *ifstr, const char *elstr,
+                     anytype data, format_flag flags)
 {
   char fn[STRING], tmp[STRING];
   FOLDER *folder = data.ptr;
@@ -349,11 +348,11 @@ static const char *newsgroup_format_str (char *dest, ssize_t destlen, char op,
   case 's':
     if (flags & M_FORMAT_OPTIONAL) {
       if (folder->ff->nd->unread != 0)
-        m_strformat (dest, destlen, ifstr, newsgroup_format_str,
-                           data, flags);
+        m_strformat(dest, destlen, 0, ifstr, newsgroup_format_str,
+                    data, flags);
       else
-        m_strformat (dest, destlen, elstr, newsgroup_format_str,
-                           data, flags);
+        m_strformat (dest, destlen, 0, elstr, newsgroup_format_str,
+                     data, flags);
     }
     else if (Context && Context->data == folder->ff->nd) {
       snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
@@ -463,13 +462,9 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state,
       nntp_sync_sidebar (data);
       if (m_strncmp (prefix, data->group, m_strlen(prefix)) != 0)
         continue;
-      if (!((regexec (Mask.rx, data->group, 0, NULL, 0) == 0) ^ Mask.not))
+      if (!((regexec (Mask.rx, data->group, 0, NULL, 0) == 0) ^ Mask.neg))
         continue;
-#ifdef USE_NNTP
       add_folder (menu, state, data->group, NULL, data, data->new);
-#else
-      add_folder (menu, state, data->group, NULL, data->new);
-#endif
     }
     sidebar_draw ();
   }
@@ -516,7 +511,7 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state,
 
       if (m_strncmp(prefix, de->d_name, m_strlen(prefix)) != 0)
         continue;
-      if (!((regexec (Mask.rx, de->d_name, 0, NULL, 0) == 0) ^ Mask.not))
+      if (!((regexec (Mask.rx, de->d_name, 0, NULL, 0) == 0) ^ Mask.neg))
         continue;
 
       mutt_concat_path(buffer, sizeof(buffer), d, de->d_name);
@@ -644,13 +639,11 @@ static void folder_entry (char *s, ssize_t slen, MUTTMENU * menu, int num)
 
 #ifdef USE_NNTP
   if (option (OPTNEWS))
-    m_strformat(s, slen, NONULL (GroupFormat), newsgroup_format_str,
-                (void*)&folder,
+    m_strformat(s, slen, COLS - SW, GroupFormat, newsgroup_format_str, &folder,
                 option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
   else
 #endif
-    m_strformat(s, slen, NONULL (FolderFormat), folder_format_str,
-               (void *)&folder,
+    m_strformat(s, slen, COLS - SW, FolderFormat, folder_format_str, &folder,
                option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
 }
 
@@ -933,7 +926,7 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
             /* try to restore the old values */
             m_strcpy(LastDir, sizeof(LastDir), OldLastDir);
             if (examine_directory (menu, &state, LastDir, prefix) == -1) {
-              m_strcpy(LastDir, sizeof(LastDir), NONULL(Homedir));
+              m_strcpy(LastDir, sizeof(LastDir), NONULL(MCore.homedir));
               goto bail;
             }
           }
@@ -1151,7 +1144,7 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
       if (mutt_get_field (_("File Mask: "), buf, sizeof (buf), 0) == 0) {
         regex_t *rx = p_new(regex_t, 1);
         char *s = buf;
-        int not = 0, err;
+        int neg = 0, err;
 
         buffy = 0;
         /* assume that the user wants to see everything */
@@ -1160,7 +1153,7 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
         s = vskipspaces(s);
         if (*s == '!') {
           s = vskipspaces(s + 1);
-          not = 1;
+          neg = 1;
         }
 
         if ((err = REGCOMP (rx, s, REG_NOSUB)) != 0) {
@@ -1174,7 +1167,7 @@ void _mutt_select_file (char *f, ssize_t flen, int flags, char ***files,
           regfree (Mask.rx);
           p_delete(&Mask.rx);
           Mask.rx = rx;
-          Mask.not = not;
+          Mask.neg = neg;
 
           destroy_state (&state);
           if (state.imap_browse) {