From: Rocco Rutte <pdmef@gmx.net>
Date: Thu, 17 Jul 2008 17:48:16 +0000 (+0200)
Subject: Cleanup unused vars changeset ba0d96408425 didn't remove
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a75736f1e5495edda4c840a16ce26ef428b92028;p=mutt

Cleanup unused vars changeset ba0d96408425 didn't remove
---

diff --git a/ChangeLog b/ChangeLog
index bdec4ed9..fb6b636b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-11 11:34 +0200  Rocco Rutte  <pdmef@gmx.net>  (cc67b008038c)
+
+	* doc/manual.xml.head: Mention that @ can be used in usernames in URLs
+
+2008-07-11 11:33 +0200  Rocco Rutte  <pdmef@gmx.net>  (953430663eff)
+
+	* ChangeLog, charset.c: Allow UTF-8 charset to be misspelled as "utf8"
+
 2008-07-11 08:47 +0200  Rocco Rutte  <pdmef@gmx.net>  (934a802dff7f)
 
 	* mutt_ssl.c: Verify hostname in (Open)SSL certificate validation
diff --git a/query.c b/query.c
index 787af78e..46d9e999 100644
--- a/query.c
+++ b/query.c
@@ -55,10 +55,6 @@ static struct mapping_t QueryHelp[] = {
   { NULL }
 };
 
-/* Variables for outsizing output format */
-static int FirstColumn;
-static int SecondColumn;
-
 static void query_menu (char *buf, size_t buflen, QUERY *results, int retbuf);
 
 static ADDRESS *result_to_addr (QUERY *r)
@@ -87,7 +83,6 @@ static QUERY *run_query (char *s, int quiet)
   char msg[STRING];
   char *p;
   pid_t thepid;
-  int l;
 
 
   mutt_expand_file_fmt (cmd, sizeof(cmd), QueryCmd, s);
@@ -108,8 +103,6 @@ static QUERY *run_query (char *s, int quiet)
     {
       if (first == NULL)
       {
-	FirstColumn = 0;
-	SecondColumn = 0;
 	first = (QUERY *) safe_calloc (1, sizeof (QUERY));
 	cur = first;
       }
@@ -119,23 +112,14 @@ static QUERY *run_query (char *s, int quiet)
 	cur = cur->next;
       }
 
-      l = mutt_strwidth (p);
-      if (l > SecondColumn)
-	SecondColumn = l;
-	
       cur->addr = rfc822_parse_adrlist (cur->addr, p);
       p = strtok(NULL, "\t\n");
       if (p)
       {
-	l = mutt_strwidth (p);
-	if (l > FirstColumn)
-	  FirstColumn = l;
 	cur->name = safe_strdup (p);
 	p = strtok(NULL, "\t\n");
 	if (p)
-	{
 	  cur->other = safe_strdup (p);
-	}
       }
     }
   }