Various IMAP protocol improvements

[nmh] / sbr / dtimep.l

diff --git a/sbr/dtimep.l b/sbr/dtimep.l
index e9dd815341f6b44512d227d98fbd3d1631a971af..4db108dcfdde2211f2a2c849ec3dbbdd2decdc68 100644 (file)
--- a/sbr/dtimep.l
+++ b/sbr/dtimep.l
@@ -11,6 +11,8 @@
 %a5000
 %{
 #include <h/nmh.h>
+#include <h/mh.h>
+#include <h/utils.h>
 #include <h/tws.h>
 
   /* Since we're looking at a string at a time, don't worry about
@@ -43,13 +45,13 @@
 
 #define yyterminate() (void)yy_delete_buffer(lexhandle); \
   if(!(tw.tw_flags & TW_SUCC)) { \
-    return (struct tws *)NULL; \
+    return NULL; \
   } \
   if(tw.tw_year < 1970) \
     tw.tw_year += 1900; \
   if(tw.tw_year < 1970) \
     tw.tw_year += 100; \
-  return(&tw)
+  return &tw
 
 /*
  * Table to convert month names to numeric month.  We use the
@@ -154,10 +156,6 @@ static int day_map[] = {
                        --cp; }
 #define SKIPTOA()    { while ( !isalpha((unsigned char) *cp++) ) ; \
                        --cp; }
-#define SKIPSP()     { while ( isspace((unsigned char) *cp++) ) ; \
-                       --cp; }
-#define SKIPTOSP()   { while ( !isspace((unsigned char) *cp++) ) ; \
-                       --cp; }
 
 # ifdef HAVE_SYS_TIME_H
 #  include <sys/time.h>
@@ -231,7 +229,7 @@ nl      [ \t\n()]
   char *cp;
   static struct tws tw; 
 
-  memset(&tw,0,sizeof(struct tws));
+  ZERO(&tw);
 
   lexhandle = yy_scan_string(lexstr);
 %}
@@ -380,7 +378,8 @@ nl      [ \t\n()]
  *  "%option nounput" which is flex-specific
  *  makefile hackery just to compile dtimep.c with different flags
  */
-void dtimep_yyunput(int c)
+void
+dtimep_yyunput(int c)
 {
     unput(c);
 }