Rocco Rutte:

- handle Incoming as array not list with BUFFY_SIZE (reported by Jens Kubieziel)
- s/mutt_// in regex.c to solve linking problems

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@231 e385b8ad-14ed-0310-8656-cc95a2468c6d

diff --git a/buffy.c b/buffy.c
index c1dadeb..a6436c2 100644 (file)
--- a/buffy.c
+++ b/buffy.c
@@ -135,19 +135,21 @@ int test_new_folder (const char *path)
 
 BUFFY *mutt_find_mailbox (const char *path)
 {
-  BUFFY *tmp = NULL;
   struct stat sb;
   struct stat tmp_sb;
+  int i = 0;
 
   if (stat (path, &sb) != 0)
     return NULL;
 
-  for (tmp = Incoming; tmp; tmp = tmp->next) {
-    if (stat (tmp->path, &tmp_sb) == 0 &&
-        sb.st_dev == tmp_sb.st_dev && sb.st_ino == tmp_sb.st_ino)
-      break;
+  if (!list_empty(Incoming)) {
+    for (i = 0; i < Incoming->length; i++) {
+      if (stat (Incoming->data[i], &tmp_sb) == 0 &&
+          sb.st_dev == tmp_sb.st_dev && sb.st_ino == tmp_sb.st_ino)
+        return ((BUFFY*) Incoming->data[i]);
+    }
   }
-  return tmp;
+  return (NULL);
 }
 
 void mutt_update_mailbox (BUFFY * b)

diff --git a/regex.c b/regex.c
index ddd4228..b2755ca 100644 (file)
--- a/regex.c
+++ b/regex.c
@@ -177,29 +177,29 @@ enum { MUTT_ALNUM =
 
 static int ctype (const char *name)
 {
-  if (0 == mutt_strcmp (name, "alnum"))
+  if (0 == strcmp (name, "alnum"))
     return MUTT_ALNUM;
-  if (0 == mutt_strcmp (name, "alpha"))
+  if (0 == strcmp (name, "alpha"))
     return MUTT_ALPHA;
-  if (0 == mutt_strcmp (name, "blank"))
+  if (0 == strcmp (name, "blank"))
     return MUTT_BLANK;
-  if (0 == mutt_strcmp (name, "cntrl"))
+  if (0 == strcmp (name, "cntrl"))
     return MUTT_CNTRL;
-  if (0 == mutt_strcmp (name, "digit"))
+  if (0 == strcmp (name, "digit"))
     return MUTT_DIGIT;
-  if (0 == mutt_strcmp (name, "graph"))
+  if (0 == strcmp (name, "graph"))
     return MUTT_GRAPH;
-  if (0 == mutt_strcmp (name, "lower"))
+  if (0 == strcmp (name, "lower"))
     return MUTT_LOWER;
-  if (0 == mutt_strcmp (name, "print"))
+  if (0 == strcmp (name, "print"))
     return MUTT_PRINT;
-  if (0 == mutt_strcmp (name, "punct"))
+  if (0 == strcmp (name, "punct"))
     return MUTT_PUNCT;
-  if (0 == mutt_strcmp (name, "space"))
+  if (0 == strcmp (name, "space"))
     return MUTT_SPACE;
-  if (0 == mutt_strcmp (name, "upper"))
+  if (0 == strcmp (name, "upper"))
     return MUTT_UPPER;
-  if (0 == mutt_strcmp (name, "xdigit"))
+  if (0 == strcmp (name, "xdigit"))
     return MUTT_XDIGIT;
   return MUTT_INVALID;
 }
@@ -397,7 +397,7 @@ char *alloca ();
 
 #define BYTEWIDTH 8             /* In bits.  */
 
-#define STREQ(s1, s2) ((mutt_strcmp (s1, s2) == 0))
+#define STREQ(s1, s2) ((strcmp (s1, s2) == 0))
 
 #undef MAX
 #undef MIN
@@ -5390,7 +5390,7 @@ re_comp (s)
   /* Match anchors at newlines.  */
   re_comp_buf.newline_anchor = 1;
 
-  ret = regex_compile (s, mutt_strlen (s), re_syntax_options, &re_comp_buf);
+  ret = regex_compile (s, strlen (s), re_syntax_options, &re_comp_buf);
 
   if (!ret)
     return NULL;
@@ -5407,7 +5407,7 @@ int
 re_exec (s)
      const char *s;
 {
-  const int len = mutt_strlen (s);
+  const int len = strlen (s);
 
   return
     0 <= re_search (&re_comp_buf, s, len, 0, len, (struct re_registers *) 0);
@@ -5504,8 +5504,8 @@ int regcomp (preg, pattern, cflags)
   preg->no_sub = !!(cflags & REG_NOSUB);
 
   /* POSIX says a null character in the pattern terminates it, so we
-     can use mutt_strlen here in compiling the pattern.  */
-  ret = regex_compile (pattern, mutt_strlen (pattern), syntax, preg);
+     can use strlen here in compiling the pattern.  */
+  ret = regex_compile (pattern, strlen (pattern), syntax, preg);
 
   /* POSIX doesn't distinguish between an unmatched open-group and an
      unmatched close-group: both are REG_EPAREN.  */
@@ -5540,7 +5540,7 @@ int regexec (preg, string, nmatch, pmatch, eflags)
   int ret;
   struct re_registers regs;
   regex_t private_preg;
-  int len = mutt_strlen (string);
+  int len = strlen (string);
   boolean want_reg_info = !preg->no_sub && nmatch > 0;
 
   private_preg = *preg;
@@ -5609,7 +5609,7 @@ size_t regerror (errcode, preg, errbuf, errbuf_size)
 
   msg = gettext (re_error_msgid[errcode]);
 
-  msg_size = mutt_strlen (msg) + 1;  /* Includes the null.  */
+  msg_size = strlen (msg) + 1;  /* Includes the null.  */
 
   if (errbuf_size != 0) {
     if (msg_size > errbuf_size) {