- scan.c, scan.h: remove FORMATTYPE_STRING. It's default since we don't support anyth...

git-svn-id: svn://svn.ircd-hybrid.org/svnroot/hopm/trunk@5281 82007160-df01-0410-b94d-b575c5fd34c7

diff --git a/src/scan.c b/src/scan.c
index f8513c3f9c45bf0d3be04935dd3a9f5ecad2e8d5..be7f28ada66347eb5598c60e30459bca39e021e6 100644 (file)
--- a/src/scan.c
+++ b/src/scan.c
@@ -791,11 +791,11 @@ scan_irckline(struct scan_struct *ss, const char *format, const char *type)
   unsigned int i;
   struct kline_format_assoc table[] =
   {
-    {'i', NULL, FORMATTYPE_STRING },
-    {'h', NULL, FORMATTYPE_STRING },
-    {'u', NULL, FORMATTYPE_STRING },
-    {'n', NULL, FORMATTYPE_STRING },
-    {'t', NULL, FORMATTYPE_STRING }
+    {'i', NULL },
+    {'h', NULL },
+    {'u', NULL },
+    {'n', NULL },
+    {'t', NULL }
   };
 
   table[0].data = ss->ip;
@@ -831,10 +831,6 @@ scan_irckline(struct scan_struct *ss, const char *format, const char *type)
             {
                if(table[i].key == format[pos + 1])
                {
-                  switch(table[i].type)
-                  {
-                     case FORMATTYPE_STRING:
-
                         size = strlen(table[i].data);
 
                         /* Check if the new string can fit! */
@@ -846,9 +842,6 @@ scan_irckline(struct scan_struct *ss, const char *format, const char *type)
                            len += size;
                         }
 
-                     default:
-                        break;
-                  }
                }
             }
             /* Skip key character */

diff --git a/src/scan.h b/src/scan.h
index 8fb3a467c777f2818593756c5e8bd14530725748..1306359cea2fa7022e185cd9cd11dcf8c4b2bee5 100644 (file)
--- a/src/scan.h
+++ b/src/scan.h
@@ -47,9 +47,6 @@ struct kline_format_assoc
 {
   char key;
   const void *data;
-  int type;
 };
 
-#define FORMATTYPE_STRING 1
-
 #endif /* SCAN_H */