X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/2db38a6f98c2abb42b746064ce97417cccc27e68..4a47c2757309e338321da1e7a2f6d399a306ce7d:/lib-src/make-docfile.c?ds=sidebyside diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c index af1928c63f..e2dc99214d 100644 --- a/lib-src/make-docfile.c +++ b/lib-src/make-docfile.c @@ -67,9 +67,10 @@ along with GNU Emacs. If not, see . */ #define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP) #endif -int scan_file (); -int scan_lisp_file (); -int scan_c_file (); +int scan_file (char *filename); +int scan_lisp_file (const char *filename, const char *mode); +int scan_c_file (char *filename, const char *mode); +void fatal (const char *s1, const char *s2) NO_RETURN; #ifdef MSDOS /* s/msdos.h defines this as sys_chdir, but we're not linking with the @@ -91,8 +92,7 @@ char *progname; /* VARARGS1 */ void -error (s1, s2) - char *s1, *s2; +error (const char *s1, const char *s2) { fprintf (stderr, "%s: ", progname); fprintf (stderr, s1, s2); @@ -103,8 +103,7 @@ error (s1, s2) /* VARARGS1 */ void -fatal (s1, s2) - char *s1, *s2; +fatal (const char *s1, const char *s2) { error (s1, s2); exit (EXIT_FAILURE); @@ -113,8 +112,7 @@ fatal (s1, s2) /* Like malloc but get fatal error if memory is exhausted. */ void * -xmalloc (size) - unsigned int size; +xmalloc (unsigned int size) { void *result = (void *) malloc (size); if (result == NULL) @@ -123,9 +121,7 @@ xmalloc (size) } int -main (argc, argv) - int argc; - char **argv; +main (int argc, char **argv) { int i; int err_count = 0; @@ -187,8 +183,7 @@ main (argc, argv) /* Add a source file name boundary marker in the output file. */ void -put_filename (filename) - char *filename; +put_filename (char *filename) { char *tmp; @@ -207,10 +202,10 @@ put_filename (filename) /* Return 1 if file is not found, 0 if it is found. */ int -scan_file (filename) - char *filename; +scan_file (char *filename) { - int len = strlen (filename); + + size_t len = strlen (filename); put_filename (filename); if (len > 4 && !strcmp (filename + len - 4, ".elc")) @@ -239,11 +234,11 @@ struct rcsoc_state /* A keyword we look for at the beginning of lines. If found, it is not copied, and SAW_KEYWORD is set to true. */ - char *keyword; - /* The current point we've reached in an occurance of KEYWORD in + const char *keyword; + /* The current point we've reached in an occurrence of KEYWORD in the input stream. */ - char *cur_keyword_ptr; - /* Set to true if we saw an occurance of KEYWORD. */ + const char *cur_keyword_ptr; + /* Set to true if we saw an occurrence of KEYWORD. */ int saw_keyword; }; @@ -251,9 +246,7 @@ struct rcsoc_state spaces are output first. */ static INLINE void -put_char (ch, state) - int ch; - struct rcsoc_state *state; +put_char (int ch, struct rcsoc_state *state) { int out_ch; do @@ -286,9 +279,7 @@ put_char (ch, state) keyword, but were in fact not. */ static void -scan_keyword_or_put_char (ch, state) - int ch; - struct rcsoc_state *state; +scan_keyword_or_put_char (int ch, struct rcsoc_state *state) { if (state->keyword && *state->cur_keyword_ptr == ch @@ -336,7 +327,7 @@ scan_keyword_or_put_char (ch, state) keyword, but it was a false alarm. Output the part we scanned. */ { - char *p; + const char *p; for (p = state->keyword; p < state->cur_keyword_ptr; p++) put_char (*p, state); @@ -354,16 +345,12 @@ scan_keyword_or_put_char (ch, state) PRINTFLAG is positive, output string contents to outfile. If it is negative, store contents in buf. Convert escape sequences \n and \t to newline and tab; discard \ followed by newline. - If SAW_USAGE is non-zero, then any occurances of the string `usage:' + If SAW_USAGE is non-zero, then any occurrences of the string `usage:' at the beginning of a line will be removed, and *SAW_USAGE set to true if any were encountered. */ int -read_c_string_or_comment (infile, printflag, comment, saw_usage) - FILE *infile; - int printflag; - int *saw_usage; - int comment; +read_c_string_or_comment (FILE *infile, int printflag, int comment, int *saw_usage) { register int c; struct rcsoc_state state; @@ -451,15 +438,12 @@ read_c_string_or_comment (infile, printflag, comment, saw_usage) MINARGS and MAXARGS are the minimum and maximum number of arguments. */ void -write_c_args (out, func, buf, minargs, maxargs) - FILE *out; - char *func, *buf; - int minargs, maxargs; +write_c_args (FILE *out, char *func, char *buf, int minargs, int maxargs) { register char *p; int in_ident = 0; - int just_spaced = 0; - int need_space = 1; + char *ident_start; + size_t ident_length = 0; fprintf (out, "(fn"); @@ -469,9 +453,8 @@ write_c_args (out, func, buf, minargs, maxargs) for (p = buf; *p; p++) { char c = *p; - int ident_start = 0; - /* Notice when we start printing a new identifier. */ + /* Notice when a new identifier starts. */ if ((('A' <= c && c <= 'Z') || ('a' <= c && c <= 'z') || ('0' <= c && c <= '9') @@ -481,55 +464,56 @@ write_c_args (out, func, buf, minargs, maxargs) if (!in_ident) { in_ident = 1; - ident_start = 1; - - if (need_space) - putc (' ', out); - - if (minargs == 0 && maxargs > 0) - fprintf (out, "&optional "); - just_spaced = 1; - - minargs--; - maxargs--; + ident_start = p; } else - in_ident = 0; + { + in_ident = 0; + ident_length = p - ident_start; + } } - /* Print the C argument list as it would appear in lisp: - print underscores as hyphens, and print commas and newlines - as spaces. Collapse adjacent spaces into one. */ - if (c == '_') - c = '-'; - else if (c == ',' || c == '\n') - c = ' '; - - /* In C code, `default' is a reserved word, so we spell it - `defalt'; unmangle that here. */ - if (ident_start - && strncmp (p, "defalt", 6) == 0 - && ! (('A' <= p[6] && p[6] <= 'Z') - || ('a' <= p[6] && p[6] <= 'z') - || ('0' <= p[6] && p[6] <= '9') - || p[6] == '_')) - { - fprintf (out, "DEFAULT"); - p += 5; - in_ident = 0; - just_spaced = 0; - } - else if (c != ' ' || !just_spaced) + /* Found the end of an argument, write out the last seen + identifier. */ + if (c == ',' || c == ')') { - if (c >= 'a' && c <= 'z') - /* Upcase the letter. */ - c += 'A' - 'a'; - putc (c, out); - } + if (ident_length == 0) + { + error ("empty arg list for `%s' should be (void), not ()", func); + continue; + } + + if (strncmp (ident_start, "void", ident_length) == 0) + continue; + + putc (' ', out); - just_spaced = c == ' '; - need_space = 0; + if (minargs == 0 && maxargs > 0) + fprintf (out, "&optional "); + + minargs--; + maxargs--; + + /* In C code, `default' is a reserved word, so we spell it + `defalt'; unmangle that here. */ + if (ident_length == 6 && strncmp (ident_start, "defalt", 6) == 0) + fprintf (out, "DEFAULT"); + else + while (ident_length-- > 0) + { + c = *ident_start++; + if (c >= 'a' && c <= 'z') + /* Upcase the letter. */ + c += 'A' - 'a'; + else if (c == '_') + /* Print underscore as hyphen. */ + c = '-'; + putc (c, out); + } + } } + + putc (')', out); } /* Read through a c file. If a .o file is named, @@ -538,8 +522,7 @@ write_c_args (out, func, buf, minargs, maxargs) Accepts any word starting DEF... so it finds DEFSIMPLE and DEFPRED. */ int -scan_c_file (filename, mode) - char *filename, *mode; +scan_c_file (char *filename, const char *mode) { FILE *infile; register int c; @@ -815,8 +798,7 @@ scan_c_file (filename, mode) */ void -skip_white (infile) - FILE *infile; +skip_white (FILE *infile) { char c = ' '; while (c == ' ' || c == '\t' || c == '\n' || c == '\r') @@ -825,9 +807,7 @@ skip_white (infile) } void -read_lisp_symbol (infile, buffer) - FILE *infile; - char *buffer; +read_lisp_symbol (FILE *infile, char *buffer) { char c; char *fillp = buffer; @@ -855,8 +835,7 @@ read_lisp_symbol (infile, buffer) } int -scan_lisp_file (filename, mode) - char *filename, *mode; +scan_lisp_file (const char *filename, const char *mode) { FILE *infile; register int c;