X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8890670d4c1e8e3f9608c2850c1fe299fb256776..ef1ba39e8dae81091b6c3e73e72825ef6edea3c6:/uip/scansbr.c diff --git a/uip/scansbr.c b/uip/scansbr.c index 804f72d5..8d2a46d2 100644 --- a/uip/scansbr.c +++ b/uip/scansbr.c @@ -86,7 +86,7 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg, datecomp = fmt_findcomp("date"); cptr = fmt_findcomp("folder"); if (cptr && folder) - cptr->c_text = getcpy(folder); + cptr->c_text = mh_xstrdup(folder); if (fmt_addcompentry("encrypted")) { ncomps++; } @@ -157,9 +157,8 @@ scan (FILE *inb, int innum, int outnum, char *nfs, int width, int curflg, if (ferror(inb)) { advise("read", "unable to"); /* "read error" */ return SCNFAT; - } else { - return SCNEOF; } + return SCNEOF; } if (outnum) { @@ -321,7 +320,7 @@ finished: if (datecomp) { if (! datecomp->c_text) { if (datecomp->c_tws == NULL) - datecomp->c_tws = mh_xcalloc(1, sizeof *datecomp->c_tws); + NEW0(datecomp->c_tws); *datecomp->c_tws = *dlocaltime ((time_t *) &st.st_mtime); datecomp->c_flags |= CF_DATEFAB|CF_TRUE; } else {