From d5cad867eca6beb34092cee18237cbc55100c946 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 20 Mar 2011 22:04:41 -0700 Subject: [ChangeLog] fakemail: Remove dependency on ignore-value. * Makefile.in (GNULIB_MODULES): Add stdio. * lib/stdio.in.h, m4/stdio_h.m4: New files, automatically imported from gnulib. [lib-src/ChangeLog] fakemail: Remove dependency on ignore-value. This undoes some of the recent fakemail-related changes. It is made possible due to recent changes to gnulib's stdio module. * Makefile.in (fakemail${EXEEXT}): Do not depend on ignore-value.h. * fakemail.c: Do not include ignore-value.h. (put_line): Do not use ignore_value. --- lib-src/ChangeLog | 9 +++++++++ lib-src/Makefile.in | 2 +- lib-src/fakemail.c | 4 +--- 3 files changed, 11 insertions(+), 4 deletions(-) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index bd1a84cf0b9..cc713f0b68c 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,12 @@ +2011-03-21 Paul Eggert + + fakemail: Remove dependency on ignore-value. + This undoes some of the recent fakemail-related changes. + It is made possible due to recent changes to gnulib's stdio module. + * Makefile.in (fakemail${EXEEXT}): Do not depend on ignore-value.h. + * fakemail.c: Do not include ignore-value.h. + (put_line): Do not use ignore_value. + 2011-03-03 Drake Wilson (tiny change) * emacsclient.c (longopts): Add quiet. diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index d622233efb4..f671b0844ce 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -353,7 +353,7 @@ movemail.o: ${srcdir}/movemail.c ../src/config.h pop.o: ${srcdir}/pop.c ${srcdir}/../lib/min-max.h ../src/config.h $(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} ${srcdir}/pop.c -fakemail${EXEEXT}: ${srcdir}/fakemail.c ${srcdir}/../lib/ignore-value.h ../src/config.h +fakemail${EXEEXT}: ${srcdir}/fakemail.c ../src/config.h $(CC) ${ALL_CFLAGS} ${srcdir}/fakemail.c $(LOADLIBES) -o fakemail emacsclient${EXEEXT}: ${srcdir}/emacsclient.c ../src/config.h diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c index 780a104b405..940d6219425 100644 --- a/lib-src/fakemail.c +++ b/lib-src/fakemail.c @@ -62,8 +62,6 @@ main () /* This is to declare cuserid. */ #include - -#include /* Type definitions */ @@ -500,7 +498,7 @@ put_line (const char *string) } } /* Output that much, then break the line. */ - ignore_value (fwrite (s, 1, breakpos - s, rem->handle)); + fwrite (s, 1, breakpos - s, rem->handle); column = 8; /* Skip whitespace and prepare to print more addresses. */ -- cgit v1.2.1 From f0d80d43baa89029ea030a98350a74793ee5dc89 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 21 Mar 2011 00:46:53 -0700 Subject: update-game-score: fix bug with -r * update-game-score.c (main): Don't set 'scores' to garbage when -r is specified and scorecount != MAX_SCORES. This bug was introduced in the 2002-04-10 change, and was found with gcc -Wstrict-overflow (GCC 4.5.2, x86-64). --- lib-src/ChangeLog | 6 ++++++ lib-src/update-game-score.c | 14 ++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index cc713f0b68c..2548561f313 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,5 +1,11 @@ 2011-03-21 Paul Eggert + update-game-score: fix bug with -r + * update-game-score.c (main): Don't set 'scores' to garbage when + -r is specified and scorecount != MAX_SCORES. This bug was + introduced in the 2002-04-10 change, and was found with gcc + -Wstrict-overflow (GCC 4.5.2, x86-64). + fakemail: Remove dependency on ignore-value. This undoes some of the recent fakemail-related changes. It is made possible due to recent changes to gnulib's stdio module. diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c index 70b79a64f91..e95e2ce259d 100644 --- a/lib-src/update-game-score.c +++ b/lib-src/update-game-score.c @@ -242,13 +242,15 @@ main (int argc, char **argv) push_score (&scores, &scorecount, newscore, user_id, newdata); sort_scores (scores, scorecount, reverse); /* Limit the number of scores. If we're using reverse sorting, then - we should increment the beginning of the array, to skip over the - *smallest* scores. Otherwise, we just decrement the number of - scores, since the smallest will be at the end. */ + also increment the beginning of the array, to skip over the + *smallest* scores. Otherwise, just decrementing the number of + scores suffices, since the smallest is at the end. */ if (scorecount > MAX_SCORES) - scorecount -= (scorecount - MAX_SCORES); - if (reverse) - scores += (scorecount - MAX_SCORES); + { + if (reverse) + scores += (scorecount - MAX_SCORES); + scorecount = MAX_SCORES; + } if (write_scores (scorefile, scores, scorecount) < 0) { unlock_file (scorefile, lockstate); -- cgit v1.2.1 From 5d6d7e57010a1e09d553885c1ad5d54b7ba96747 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 21 Mar 2011 09:22:16 -0700 Subject: Add Bug#. --- lib-src/ChangeLog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 2548561f313..a5d20af4263 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -2,8 +2,8 @@ update-game-score: fix bug with -r * update-game-score.c (main): Don't set 'scores' to garbage when - -r is specified and scorecount != MAX_SCORES. This bug was - introduced in the 2002-04-10 change, and was found with gcc + -r is specified and scorecount != MAX_SCORES (Bug#8310). This bug + was introduced in the 2002-04-10 change, and was found with gcc -Wstrict-overflow (GCC 4.5.2, x86-64). fakemail: Remove dependency on ignore-value. -- cgit v1.2.1 From 3ef271f27f47dab138d431a72838d43a17102e27 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 21 Mar 2011 09:40:05 -0700 Subject: etags: In Prolog functions, don't assume int fits in size_t. This avoids a warning with gcc -Wstrict-overflow. * etags.c (Prolog_functions, prolog_pr, prolog_atom): Use size_t, not int, to store sizes. (prolog_atom): Return 0, not -1, on error. All callers changed. --- lib-src/ChangeLog | 6 ++++++ lib-src/etags.c | 32 ++++++++++++++++---------------- 2 files changed, 22 insertions(+), 16 deletions(-) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index a5d20af4263..cb847669deb 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,5 +1,11 @@ 2011-03-21 Paul Eggert + etags: In Prolog functions, don't assume int fits in size_t. + This avoids a warning with gcc -Wstrict-overflow. + * etags.c (Prolog_functions, prolog_pr, prolog_atom): Use size_t, + not int, to store sizes. + (prolog_atom): Return 0, not -1, on error. All callers changed. + update-game-score: fix bug with -r * update-game-score.c (main): Don't set 'scores' to garbage when -r is specified and scorecount != MAX_SCORES (Bug#8310). This bug diff --git a/lib-src/etags.c b/lib-src/etags.c index 385e4cc9721..0c14a0d1663 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -5254,16 +5254,16 @@ HTML_labels (FILE *inf) * Original code by Sunichirou Sugou (1989) * Rewritten by Anders Lindgren (1996) */ -static int prolog_pr (char *, char *); +static size_t prolog_pr (char *, char *); static void prolog_skip_comment (linebuffer *, FILE *); -static int prolog_atom (char *, int); +static size_t prolog_atom (char *, size_t); static void Prolog_functions (FILE *inf) { char *cp, *last; - int len; - int allocated; + size_t len; + size_t allocated; allocated = 0; len = 0; @@ -5320,16 +5320,16 @@ prolog_skip_comment (linebuffer *plb, FILE *inf) * Return the size of the name of the predicate or rule, or 0 if no * header was found. */ -static int +static size_t prolog_pr (char *s, char *last) /* Name of last clause. */ { - int pos; - int len; + size_t pos; + size_t len; pos = prolog_atom (s, 0); - if (pos < 1) + if (! pos) return 0; len = pos; @@ -5339,7 +5339,7 @@ prolog_pr (char *s, char *last) || (s[pos] == '(' && (pos += 1)) || (s[pos] == ':' && s[pos + 1] == '-' && (pos += 2))) && (last == NULL /* save only the first clause */ - || len != (int)strlen (last) + || len != strlen (last) || !strneq (s, last, len))) { make_tag (s, len, TRUE, s, pos, lineno, linecharno); @@ -5351,17 +5351,17 @@ prolog_pr (char *s, char *last) /* * Consume a Prolog atom. - * Return the number of bytes consumed, or -1 if there was an error. + * Return the number of bytes consumed, or 0 if there was an error. * * A prolog atom, in this context, could be one of: * - An alphanumeric sequence, starting with a lower case letter. * - A quoted arbitrary string. Single quotes can escape themselves. * Backslash quotes everything. */ -static int -prolog_atom (char *s, int pos) +static size_t +prolog_atom (char *s, size_t pos) { - int origpos; + size_t origpos; origpos = pos; @@ -5390,11 +5390,11 @@ prolog_atom (char *s, int pos) } else if (s[pos] == '\0') /* Multiline quoted atoms are ignored. */ - return -1; + return 0; else if (s[pos] == '\\') { if (s[pos+1] == '\0') - return -1; + return 0; pos += 2; } else @@ -5403,7 +5403,7 @@ prolog_atom (char *s, int pos) return pos - origpos; } else - return -1; + return 0; } -- cgit v1.2.1 From 58cb46fbf4a0d3b37cb9cf2b07446eaa48663693 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 21 Mar 2011 09:41:03 -0700 Subject: * etags.c (Ada_funcs): Redo slightly to avoid overflow warning. --- lib-src/ChangeLog | 2 ++ lib-src/etags.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index cb847669deb..6c25f582eea 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,5 +1,7 @@ 2011-03-21 Paul Eggert + * etags.c (Ada_funcs): Redo slightly to avoid overflow warning. + etags: In Prolog functions, don't assume int fits in size_t. This avoids a warning with gcc -Wstrict-overflow. * etags.c (Prolog_functions, prolog_pr, prolog_atom): Use size_t, diff --git a/lib-src/etags.c b/lib-src/etags.c index 0c14a0d1663..6cb321fe75e 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -4198,7 +4198,7 @@ Ada_funcs (FILE *inf) /* Skip a string i.e. "abcd". */ if (inquote || (*dbp == '"')) { - dbp = etags_strchr ((inquote) ? dbp : dbp+1, '"'); + dbp = etags_strchr (dbp + !inquote, '"'); if (dbp != NULL) { inquote = FALSE; -- cgit v1.2.1 From b1f961e1fa871419e3e75759ad2fefee032ebff5 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 21 Mar 2011 11:03:15 -0700 Subject: * ebrowse.c: Use size_t, not int, for sizes. This avoids a warning with gcc -Wstrict-overflow, and works better for very large objects. (inbuffer_size): Now size_t. All uses changed. (xmalloc, xrealloc, operator_name, process_file): Use size_t for sizes. Don't bother testing whether a size_t value can be negative. --- lib-src/ChangeLog | 7 +++++++ lib-src/ebrowse.c | 22 ++++++++++------------ 2 files changed, 17 insertions(+), 12 deletions(-) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 6c25f582eea..909bee743bb 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,5 +1,12 @@ 2011-03-21 Paul Eggert + * ebrowse.c: Use size_t, not int, for sizes. + This avoids a warning with gcc -Wstrict-overflow, and works + better for very large objects. + (inbuffer_size): Now size_t. All uses changed. + (xmalloc, xrealloc, operator_name, process_file): Use size_t for + sizes. Don't bother testing whether a size_t value can be negative. + * etags.c (Ada_funcs): Redo slightly to avoid overflow warning. etags: In Prolog functions, don't assume int fits in size_t. diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c index 113b6fdfe40..7871a804997 100644 --- a/lib-src/ebrowse.c +++ b/lib-src/ebrowse.c @@ -378,7 +378,7 @@ int max_regexp = 50; char *inbuffer; char *in; -int inbuffer_size; +size_t inbuffer_size; /* Return the current buffer position in the input file. */ @@ -492,7 +492,7 @@ yyerror (const char *format, const char *s) available. */ static void * -xmalloc (int nbytes) +xmalloc (size_t nbytes) { void *p = malloc (nbytes); if (p == NULL) @@ -507,7 +507,7 @@ xmalloc (int nbytes) /* Like realloc but print an error and exit if out of memory. */ static void * -xrealloc (void *p, int sz) +xrealloc (void *p, size_t sz) { p = realloc (p, sz); if (p == NULL) @@ -2792,10 +2792,10 @@ parse_classname (void) static char * operator_name (int *sc) { - static int id_size = 0; + static size_t id_size = 0; static char *id = NULL; const char *s; - int len; + size_t len; MATCH (); @@ -2811,7 +2811,7 @@ operator_name (int *sc) len = strlen (s) + 10; if (len > id_size) { - int new_size = max (len, 2 * id_size); + size_t new_size = max (len, 2 * id_size); id = (char *) xrealloc (id, new_size); id_size = new_size; } @@ -2832,7 +2832,7 @@ operator_name (int *sc) } else { - int tokens_matched = 0; + size_t tokens_matched = 0; len = 20; if (len > id_size) @@ -2853,7 +2853,7 @@ operator_name (int *sc) len += strlen (s) + 2; if (len > id_size) { - int new_size = max (len, 2 * id_size); + size_t new_size = max (len, 2 * id_size); id = (char *) xrealloc (id, new_size); id_size = new_size; } @@ -3550,7 +3550,7 @@ process_file (char *file) fp = open_file (file); if (fp) { - int nread, nbytes; + size_t nread, nbytes; /* Give a progress indication if needed. */ if (f_very_verbose) @@ -3574,12 +3574,10 @@ process_file (char *file) } nbytes = fread (inbuffer + nread, 1, READ_CHUNK_SIZE, fp); - if (nbytes <= 0) + if (nbytes == 0) break; nread += nbytes; } - if (nread < 0) - nread = 0; inbuffer[nread] = '\0'; /* Reinitialize scanner and parser for the new input file. */ -- cgit v1.2.1 From 8cc1d5193337bef03f9525f2c017f6e70c4e64b9 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 22 Mar 2011 20:09:55 -0700 Subject: Replace mkinstalldirs with `install-sh -d', as automake recommends. * Makefile.in (mkdir): Use `install-sh -d' instead of mkinstalldirs. (sync-from-gnulib): Don't sync mkinstalldirs. * make-dist: Don't distribute mkinstalldirs. * leim/Makefile.in (install): Use `install-sh -d' rather than mkinstalldirs. * lib-src/Makefile.in ($(DESTDIR)${archlibdir}): Use `install-sh -d' rather than mkinstalldirs. * configure.in, doc/emacs/Makefile.in: Update comments. * admin/notes/copyright: Remove mkinstalldirs. --- lib-src/ChangeLog | 5 +++++ lib-src/Makefile.in | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 3df2f6881db..0e46a83aafa 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2011-03-23 Glenn Morris + + * Makefile.in ($(DESTDIR)${archlibdir}): + Use `install-sh -d' rather than mkinstalldirs. + 2011-03-23 Paul Eggert * ebrowse.c: Use size_t, not int, for sizes. diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index f671b0844ce..36366a4d2e7 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -235,13 +235,13 @@ maybe-blessmail: $(BLESSMAIL_TARGET) $(DESTDIR)${archlibdir}: all @echo @echo "Installing utilities run internally by Emacs." - umask 022; $(top_srcdir)/mkinstalldirs $(DESTDIR)${archlibdir} + umask 022; $(top_srcdir)/install-sh -d $(DESTDIR)${archlibdir} if [ `(cd $(DESTDIR)${archlibdir} && /bin/pwd)` != `/bin/pwd` ]; then \ for file in ${UTILITIES}; do \ $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file $(DESTDIR)${archlibdir}/$$file ; \ done ; \ fi - umask 022; $(top_srcdir)/mkinstalldirs $(DESTDIR)${gamedir}; \ + umask 022; $(top_srcdir)/install-sh -d $(DESTDIR)${gamedir}; \ touch $(DESTDIR)${gamedir}/snake-scores; \ touch $(DESTDIR)${gamedir}/tetris-scores -if chown ${gameuser} $(DESTDIR)${archlibdir}/update-game-score && chmod u+s $(DESTDIR)${archlibdir}/update-game-score; then \ -- cgit v1.2.1 From 9c88f339493465e8e200b21885f2ac886b299169 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Wed, 23 Mar 2011 17:25:38 +0100 Subject: w32: Fix some warnings reported by -Wall -Wextra. * lib-src/ntlib.c: Include . * nt/cmdproxy.c: Include . (make_absolute): Remove unused variable `i'. * src/w32fns.c (x_set_menu_bar_lines): Remove unused variable `olines'. (w32_wnd_proc): Pass NULL to Windows API, not uninitialized buffer. (Fx_close_connection): Remove unused variable `i'. * src/w32font.c (w32font_draw): Return number of glyphs. (w32font_open_internal): Remove unused variable `i'. (w32font_driver): Add missing initializer. * src/w32menu.c (utf8to16): Remove unused variable `utf16'. (fill_in_menu): Remove unused variable `items_added'. * src/w32term.c (last_mouse_press_frame): Remove static global variable. (w32_clip_to_row): Remove unused variable `f'. (x_delete_terminal): Remove unused variable `i'. * src/w32uniscribe.c (uniscribe_shape): Remove unused variable `nclusters'. (NOTHING): Remove unused static global variable. (uniscribe_check_otf): Remove unused variable `table'. (uniscribe_font_driver): Add missing initializers. --- lib-src/ChangeLog | 4 ++++ lib-src/ntlib.c | 1 + 2 files changed, 5 insertions(+) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 0e46a83aafa..672fe8c8541 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2011-03-23 Juanma Barranquero + + * ntlib.c: Include . + 2011-03-23 Glenn Morris * Makefile.in ($(DESTDIR)${archlibdir}): diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c index 0ecd4177d2c..83f653f3ea3 100644 --- a/lib-src/ntlib.c +++ b/lib-src/ntlib.c @@ -28,6 +28,7 @@ along with GNU Emacs. If not, see . #include #include #include +#include #include "ntlib.h" -- cgit v1.2.1 From 9af30bdf17f8371664bc0c5854c91c2e46257b5e Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 26 Mar 2011 19:27:11 -0700 Subject: Remove (RET)SIGTYPE; it is identical to void on all supported systems. Ref: http://lists.gnu.org/archive/html/emacs-devel/2011-03/msg01068.html * configure.in (AC_TYPE_SIGNAL): Remove obsolete macro. (AH_BOTTOM): Do not define SIGTYPE. * lib-src/emacsclient.c: Replace SIGTYPE with void. * nt/config.nt: Remove RETSIGTYPE, SIGTYPE (identical to void). * src/syssignal.h: Replace RETSIGTYPE with void. * src/atimer.c, src/data.c, src/dispnew.c, src/emacs.c, src/floatfns.c: * src/keyboard.c, src/keyboard.h, src/lisp.h, src/process.c, src/sysdep.c: * src/xterm.c: Replace SIGTYPE with void everywhere. * src/s/template.h (SIGTYPE): Remove commented out definition. * src/s/usg5-4-common.h (SIGTYPE): Remove definition. * admin/CPP-DEFINES: Remove SIGTYPE. --- lib-src/ChangeLog | 4 ++++ lib-src/emacsclient.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 672fe8c8541..f594efa588c 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2011-03-27 Glenn Morris + + * emacsclient.c: Replace SIGTYPE with void. + 2011-03-23 Juanma Barranquero * ntlib.c: Include . diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index abc9aee37c1..737a8d88586 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -1116,7 +1116,7 @@ socket_status (char *name) /* A signal handler that passes the signal to the Emacs process. Useful for SIGWINCH. */ -static SIGTYPE +static void pass_signal_to_emacs (int signalnum) { int old_errno = errno; @@ -1131,7 +1131,7 @@ pass_signal_to_emacs (int signalnum) /* Signal handler for SIGCONT; notify the Emacs process that it can now resume our tty frame. */ -static SIGTYPE +static void handle_sigcont (int signalnum) { int old_errno = errno; @@ -1157,7 +1157,7 @@ handle_sigcont (int signalnum) reality, we may get a SIGTSTP on C-z. Handling this signal and notifying Emacs about it should get things under control again. */ -static SIGTYPE +static void handle_sigtstp (int signalnum) { int old_errno = errno; -- cgit v1.2.1 From 8c422c30830f085a5f721b2be6c874adb05ccea8 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 28 Mar 2011 23:54:38 -0700 Subject: * etags.c (just_read_file): Remove dummy variable and simplify. --- lib-src/ChangeLog | 4 ++++ lib-src/etags.c | 6 ++---- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'lib-src') diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index f594efa588c..1c0c506f0e0 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2011-03-29 Paul Eggert + + * etags.c (just_read_file): Remove dummy variable and simplify. + 2011-03-27 Glenn Morris * emacsclient.c: Replace SIGTYPE with void. diff --git a/lib-src/etags.c b/lib-src/etags.c index 6cb321fe75e..a2cdf26abc7 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -3978,10 +3978,8 @@ Yacc_entries (FILE *inf) static void just_read_file (FILE *inf) { - register char *dummy; - - LOOP_ON_INPUT_LINES (inf, lb, dummy) - continue; + while (!feof (inf)) + readline (&lb, inf); } -- cgit v1.2.1