Mercurial > emacs
changeset 54746:effb507b5258
(xmalloc): Fix return type.
(put_filename): New fun.
(scan_file): Use it.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Wed, 07 Apr 2004 19:18:42 +0000 |
| parents | 98cf37e32872 |
| children | bdc00a83ecd1 |
| files | lib-src/ChangeLog lib-src/make-docfile.c |
| diffstat | 2 files changed, 27 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lib-src/ChangeLog Wed Apr 07 19:17:36 2004 +0000 +++ b/lib-src/ChangeLog Wed Apr 07 19:18:42 2004 +0000 @@ -1,3 +1,9 @@ +2004-04-07 Stefan Monnier <monnier@iro.umontreal.ca> + + * make-docfile.c (xmalloc): Fix return type. + (put_filename): New fun. + (scan_file): Use it. + 2004-03-09 Juanma Barranquero <lektu@terra.es> * grep-changelog: Changes to support ChangeLog.10+.
--- a/lib-src/make-docfile.c Wed Apr 07 19:17:36 2004 +0000 +++ b/lib-src/make-docfile.c Wed Apr 07 19:18:42 2004 +0000 @@ -1,5 +1,5 @@ /* Generate doc-string file for GNU Emacs from source files. - Copyright (C) 1985, 86, 92, 93, 94, 97, 1999, 2000, 2001 + Copyright (C) 1985, 86, 92, 93, 94, 97, 1999, 2000, 01, 2004 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -105,11 +105,11 @@ /* Like malloc but get fatal error if memory is exhausted. */ -long * +void * xmalloc (size) unsigned int size; { - long *result = (long *) malloc (size); + void *result = (void *) malloc (size); if (result == NULL) fatal ("virtual memory exhausted", 0); return result; @@ -178,6 +178,22 @@ return (err_count > 0 ? EXIT_FAILURE : EXIT_SUCCESS); } +/* Add a source file name boundary marker in the output file. */ +void +put_filename (filename) + char *filename; +{ + char *tmp = filename; + int len; + + while ((tmp = index (filename, '/'))) + filename = tmp + 1; + + putc (037, outfile); + putc ('S', outfile); + fprintf (outfile, "%s\n", filename); +} + /* Read file FILENAME and output its doc strings to outfile. */ /* Return 1 if file is not found, 0 if it is found. */ @@ -186,6 +202,8 @@ char *filename; { int len = strlen (filename); + + put_filename (filename); if (len > 4 && !strcmp (filename + len - 4, ".elc")) return scan_lisp_file (filename, READ_BINARY); else if (len > 3 && !strcmp (filename + len - 3, ".el"))