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

o Do not dump core in -W if dumpdates was not readable and ddatev == NULL.

Browse Source 
PR:		bin/69977

o Remove unused ddates_in.

Obtained from:	NetBSD
MFC after:	3 weeks
This commit is contained in:
Maxim Konovalov 2004-12-02 13:56:53 +00:00
parent af5eb6fcc5
commit ad0c89f79c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=138314
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sbin/dump/dump.h
View File

@ -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);

3
sbin/dump/itime.c
View File

@ -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));