X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/c066b395274021182a5f0530ccfeb1bcd167d860..b3d4a4452c332fc3550db3fbdf9e02027b41e985:/sbr/dtimep.l diff --git a/sbr/dtimep.l b/sbr/dtimep.l index 90537088..68f0ea7b 100644 --- a/sbr/dtimep.l +++ b/sbr/dtimep.l @@ -10,10 +10,10 @@ %n2500 %a5000 %{ -#include -#include -#include -#include +#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 * wrapping to the next buffer. @@ -45,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 @@ -156,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 @@ -382,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); }