more hash code simplifications.

[apps/madmutt.git] / init.c

diff --git a/init.c b/init.c
index a40576b..61d1f0a 100644 (file)
--- a/init.c
+++ b/init.c
@@ -42,7 +42,7 @@ static int parse_sort (struct option_t* dst, const char *s,
                        const struct mapping_t *map,
                        char* errbuf, ssize_t errlen);
 
-static HASH *ConfigOptions = NULL;
+static hash_t *ConfigOptions = NULL;
 
 /* for synonym warning reports: synonym found during parsing */
 typedef struct syn_t {
@@ -494,6 +494,22 @@ int quadoption (int opt)
   return (QuadOptions[n] >> b) & 0x3;
 }
 
+int query_quadoption2(int opt, const char *prompt)
+{
+  int v = mlua_reggeti(opt);
+
+  switch (v) {
+  case M_YES:
+  case M_NO:
+    return (v);
+
+  default:
+    v = mutt_yesorno(prompt, (v == M_ASKYES));
+    CLEARLINE (LINES - 1);
+    return (v);
+  }
+}
+
 int query_quadoption (int opt, const char *prompt)
 {
   int v = quadoption (opt);
@@ -1305,17 +1321,6 @@ static void mutt_set_default(const char *name __attribute__ ((unused)), void* p,
         ptr->init = m_strdup(buf);
 }
 
-static struct option_t* add_option (const char* name, const char* init,
-                                    short type, short dodup) {
-  struct option_t* option = p_new(struct option_t, 1);
-
-  option->option = m_strdup(name);
-  option->type = type;
-  if (init)
-    option->init = dodup ? m_strdup(init) : (char*) init;
-  return (option);
-}
-
 static int init_expand (char** dst, struct option_t* src) {
   BUFFER token, in;
   ssize_t len = 0;
@@ -2195,9 +2200,9 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
   err.data = error;
   err.dsize = sizeof(error);
 
-  ConfigOptions = hash_create (sizeof(MuttVars) * 2);
+  ConfigOptions = hash_new (sizeof(MuttVars) * 2, 0);
   for (i = 0; MuttVars[i].option; i++) {
-    hash_insert (ConfigOptions, MuttVars[i].option, &MuttVars[i], 0);
+    hash_insert (ConfigOptions, MuttVars[i].option, &MuttVars[i]);
   }
 
   /*
@@ -2304,14 +2309,6 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
 
   Tempdir = m_strdup((p = getenv ("TMPDIR")) ? p : "/tmp");
 
-  p = getenv ("VISUAL");
-  if (!p) {
-    p = getenv ("EDITOR");
-    if (!p)
-      p = "vi";
-  }
-  Editor = m_strdup(p);
-
   if ((p = getenv ("REPLYTO")) != NULL) {
     BUFFER buf, token;