d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jhb says a 10 line change containing casts is more invasive than a 28 line

Browse Source 
change.
This commit is contained in:
David E. O'Brien 2001-07-31 16:25:55 +00:00
parent 4f1fda9595
commit 904cc0c45c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=80742
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
usr.sbin/newsyslog/newsyslog.c
View File

@ -1006,7 +1006,7 @@ parseDWM(char *s)
{
char *t;
struct tm tm, *tmp;
u_long ul;
long l;
int nd;
static int mtab[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
int WMseen = 0;
@ -1035,10 +1035,10 @@ parseDWM(char *s)
return -1;
Dseen++;
s++;
ul = strtoul(s, &t, 10);
if (ul > 23)
l = strtol(s, &t, 10);
if (l < 0 || l > 23)
return -1;
tm.tm_hour = ul;
tm.tm_hour = l;
break;
case 'W':
@ -1046,17 +1046,17 @@ parseDWM(char *s)
return -1;
WMseen++;
s++;
ul = strtoul(s, &t, 10);
if (ul > 6)
l = strtol(s, &t, 10);
if (l < 0 || l > 6)
return -1;
if (ul != (unsigned)tm.tm_wday) {
if (l != tm.tm_wday) {
int save;
if (ul < (unsigned)tm.tm_wday) {
if (l < tm.tm_wday) {
save = 6 - tm.tm_wday;
save += (ul + 1);
save += (l + 1);
} else {
save = ul - tm.tm_wday;
save = l - tm.tm_wday;
}
tm.tm_mday += save;
@ -1078,13 +1078,13 @@ parseDWM(char *s)
s++;
t = s;
} else {
ul = strtoul(s, &t, 10);
if (ul < 1 || ul > 31)
l = strtol(s, &t, 10);
if (l < 1 || l > 31)
return -1;
if (ul > (unsigned)nd)
if (l > nd)
return -1;
tm.tm_mday = ul;
tm.tm_mday = l;
}
break;