diff options
| author | wlemb <wlemb> | 2001-07-14 13:47:49 +0000 |
|---|---|---|
| committer | wlemb <wlemb> | 2001-07-14 13:47:49 +0000 |
| commit | d58bbd890f081115ff75d4eb4539ea45b6634f3e (patch) | |
| tree | 3f6d19fb3a33b7c35dc8b50e11c183391fffa756 | |
| parent | 555085ba5f32dffa70f3a1b1b899f2f48482b3b6 (diff) | |
| download | groff-d58bbd890f081115ff75d4eb4539ea45b6634f3e.tar.gz | |
* src/preproc/html/pre-html.cc (makeTempFiles): Activate new code,
removing the old one.
* src/utils/indxbib/indxbib.cc (main): Remove compiler warning.
* src/libs/libgroff/tmpfile.cc (xtmpfile): Fix guard for `namep'.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | src/libs/libgroff/tmpfile.cc | 2 | ||||
| -rw-r--r-- | src/preproc/html/pre-html.cc | 20 | ||||
| -rw-r--r-- | src/utils/indxbib/indxbib.cc | 2 |
4 files changed, 12 insertions, 22 deletions
@@ -1,3 +1,13 @@ +2001-07-14 Werner LEMBERG <wl@gnu.org> + + * src/preproc/html/pre-html.cc (makeTempFiles): Activate new code, + removing the old one. + * src/utils/indxbib/indxbib.cc (main): Remove compiler warning. + +2001-07-14 Ralph Corderoy <ralph@inputplus.demon.co.uk> + + * src/libs/libgroff/tmpfile.cc (xtmpfile): Fix guard for `namep'. + 2001-07-12 Ruslan Ermilov <ru@FreeBSD.org> Merge -xwidth into -width. Add -xwidth functionality to -column diff --git a/src/libs/libgroff/tmpfile.cc b/src/libs/libgroff/tmpfile.cc index 06090156..27550994 100644 --- a/src/libs/libgroff/tmpfile.cc +++ b/src/libs/libgroff/tmpfile.cc @@ -183,7 +183,7 @@ FILE *xtmpfile(char **namep, #endif /* not HAVE_MKSTEMP */ if (do_unlink) add_tmp_file(templ); - if ((namep != 0) && ((*namep) != 0)) + if (namep) *namep = templ; else a_delete templ; diff --git a/src/preproc/html/pre-html.cc b/src/preproc/html/pre-html.cc index 00ccd886..b4b3ea3d 100644 --- a/src/preproc/html/pre-html.cc +++ b/src/preproc/html/pre-html.cc @@ -1365,7 +1365,6 @@ static int makeTempFiles (void) htmlFileName = "/tmp/prehtml-html"; #else -#if 0 FILE *f; f = xtmpfile(&psFileName, @@ -1384,25 +1383,6 @@ static int makeTempFiles (void) return -1; } fclose(f); -#else - int fd; - - if ((fd = mkstemp(psFileName = - xtmptemplate(PS_TEMPLATE_LONG, - PS_TEMPLATE_SHORT))) == -1) { - sys_fatal("mkstemp"); - return -1; - } - close(fd); - if ((fd = mkstemp(regionFileName = - xtmptemplate(REGION_TEMPLATE_LONG, - REGION_TEMPLATE_SHORT))) == -1) { - sys_fatal("mkstemp"); - unlink(psFileName); - return -1; - } - close(fd); -#endif #endif return 0; diff --git a/src/utils/indxbib/indxbib.cc b/src/utils/indxbib/indxbib.cc index 4b2477f7..db3e9a40 100644 --- a/src/utils/indxbib/indxbib.cc +++ b/src/utils/indxbib/indxbib.cc @@ -229,7 +229,7 @@ int main(int argc, char **argv) name_max = file_name_max("."); const char *filename = p ? p + 1 : basename; if (name_max >= 0 && - long(strlen(filename) + sizeof(INDEX_SUFFIX) - 1) > name_max) + (strlen(filename) + sizeof(INDEX_SUFFIX) - 1) > name_max) fatal("`%1.%2' is too long for a filename", filename, INDEX_SUFFIX); if (p) { p++; |