From 8cd02762f1ffb0214c07ebb1e60b1251d4937039 Mon Sep 17 00:00:00 2001 From: maxim Date: Thu, 2 Dec 2004 13:56:53 +0000 Subject: o Do not dump core in -W if dumpdates was not readable and ddatev == NULL. PR: bin/69977 o Remove unused ddates_in. Obtained from: NetBSD MFC after: 3 weeks --- sbin/dump/dump.h | 4 ++-- sbin/dump/itime.c | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/sbin/dump/dump.h b/sbin/dump/dump.h index 75b33d5..2224782 100644 --- a/sbin/dump/dump.h +++ b/sbin/dump/dump.h @@ -164,13 +164,13 @@ struct dumpdates { time_t dd_ddate; }; int nddates; /* number of records (might be zero) */ -int ddates_in; /* we have read the increment file */ struct dumpdates **ddatev; /* the arrayfied version */ void initdumptimes(void); void getdumptime(void); void putdumptime(void); #define ITITERATE(i, ddp) \ - for (ddp = ddatev[i = 0]; i < nddates; ddp = ddatev[++i]) + if (ddatev != NULL) \ + for (ddp = ddatev[i = 0]; i < nddates; ddp = ddatev[++i]) void sig(int signo); diff --git a/sbin/dump/itime.c b/sbin/dump/itime.c index 99d43ad..de880bb 100644 --- a/sbin/dump/itime.c +++ b/sbin/dump/itime.c @@ -60,7 +60,6 @@ struct dumptime { SLIST_HEAD(dthead, dumptime) dthead = SLIST_HEAD_INITIALIZER(dthead); struct dumpdates **ddatev = 0; int nddates = 0; -int ddates_in = 0; static void dumprecout(FILE *, const struct dumpdates *); static int getrecord(FILE *, struct dumpdates *); @@ -113,7 +112,6 @@ readdumptimes(FILE *df) SLIST_INSERT_HEAD(&dthead, dtwalk, dt_list); } - ddates_in = 1; /* * arrayify the list, leaving enough room for the additional * record that we may have to add to the ddate structure @@ -177,7 +175,6 @@ putdumptime(void) free((char *)ddatev); ddatev = 0; nddates = 0; - ddates_in = 0; readdumptimes(df); if (fseek(df, 0L, 0) < 0) quit("fseek: %s\n", strerror(errno)); -- cgit v1.1