diff options
Diffstat (limited to 'contrib/groff/src/preproc/refer')
| -rw-r--r-- | contrib/groff/src/preproc/refer/Makefile.sub | 14 | ||||
| -rw-r--r-- | contrib/groff/src/preproc/refer/command.cc | 7 | ||||
| -rw-r--r-- | contrib/groff/src/preproc/refer/refer.cc | 22 | ||||
| -rw-r--r-- | contrib/groff/src/preproc/refer/refer.h | 7 |
4 files changed, 25 insertions, 25 deletions
diff --git a/contrib/groff/src/preproc/refer/Makefile.sub b/contrib/groff/src/preproc/refer/Makefile.sub index 1631b5e..9f4a53b 100644 --- a/contrib/groff/src/preproc/refer/Makefile.sub +++ b/contrib/groff/src/preproc/refer/Makefile.sub @@ -1,13 +1,13 @@ -PROG=refer +PROG=refer$(EXEEXT) MAN1=refer.n XLIBS=$(LIBBIB) $(LIBGROFF) MLIB=$(LIBM) OBJS=\ - command.o \ - label.o \ - ref.o \ - refer.o \ - token.o + command.$(OBJEXT) \ + label.$(OBJEXT) \ + ref.$(OBJEXT) \ + refer.$(OBJEXT) \ + token.$(OBJEXT) CCSRCS=\ $(srcdir)/command.cc \ $(srcdir)/ref.cc \ @@ -19,5 +19,5 @@ HDRS=\ $(srcdir)/command.h \ $(srcdir)/ref.h GRAM=$(srcdir)/label.y -YTABC=$(srcdir)/label.cc +YTABC=label.cc NAMEPREFIX=$(g) diff --git a/contrib/groff/src/preproc/refer/command.cc b/contrib/groff/src/preproc/refer/command.cc index bf88c89d..a7c6bfb 100644 --- a/contrib/groff/src/preproc/refer/command.cc +++ b/contrib/groff/src/preproc/refer/command.cc @@ -1,5 +1,6 @@ // -*- C++ -*- -/* Copyright (C) 1989, 1990, 1991, 1992, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002 + Free Software Foundation, Inc. Written by James Clark (jjc@jclark.com) This file is part of groff. @@ -193,9 +194,9 @@ void input_stack::push_file(const char *fn) } if (c == EOF) break; - if (illegal_input_char(c)) + if (invalid_input_char(c)) error_with_file_and_line(fn, lineno, - "illegal input character code %1", int(c)); + "invalid input character code %1", int(c)); else { buf += c; if (c == '\n') { diff --git a/contrib/groff/src/preproc/refer/refer.cc b/contrib/groff/src/preproc/refer/refer.cc index c39def7..33df35c 100644 --- a/contrib/groff/src/preproc/refer/refer.cc +++ b/contrib/groff/src/preproc/refer/refer.cc @@ -1,5 +1,5 @@ // -*- C++ -*- -/* Copyright (C) 1989-1992, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1989-1992, 2000, 2001, 2002 Free Software Foundation, Inc. Written by James Clark (jjc@jclark.com) This file is part of groff. @@ -445,8 +445,8 @@ static void do_file(const char *filename) line += '\n'; break; } - if (illegal_input_char(c)) - error("illegal input character code %1", c); + if (invalid_input_char(c)) + error("invalid input character code %1", c); else { line += c; if (c == '\n') @@ -476,8 +476,8 @@ static void do_file(const char *filename) int d = getc(fp); if (d == ']') { while ((d = getc(fp)) != '\n' && d != EOF) { - if (illegal_input_char(d)) - error("illegal input character code %1", d); + if (invalid_input_char(d)) + error("invalid input character code %1", d); else post += d; } @@ -486,8 +486,8 @@ static void do_file(const char *filename) if (d != EOF) ungetc(d, fp); } - if (illegal_input_char(c)) - error("illegal input character code %1", c); + if (invalid_input_char(c)) + error("invalid input character code %1", c); else str += c; start_of_line = (c == '\n'); @@ -580,8 +580,8 @@ static void do_file(const char *filename) "missing `.R2' line"); break; } - if (illegal_input_char(c)) - error("illegal input character code %1", int(c)); + if (invalid_input_char(c)) + error("invalid input character code %1", int(c)); else { line += c; start_of_line = c == '\n'; @@ -1113,8 +1113,8 @@ void do_bib(const char *filename) int c = getc(fp); if (c == EOF) break; - if (illegal_input_char(c)) { - error("illegal input character code %1", c); + if (invalid_input_char(c)) { + error("invalid input character code %1", c); continue; } switch (state) { diff --git a/contrib/groff/src/preproc/refer/refer.h b/contrib/groff/src/preproc/refer/refer.h index f0ab3cd..e1e0c6d 100644 --- a/contrib/groff/src/preproc/refer/refer.h +++ b/contrib/groff/src/preproc/refer/refer.h @@ -1,5 +1,5 @@ // -*- C++ -*- -/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc. +/* Copyright (C) 1989, 1990, 1991, 1992, 2001 Free Software Foundation, Inc. Written by James Clark (jjc@jclark.com) This file is part of groff. @@ -18,15 +18,14 @@ You should have received a copy of the GNU General Public License along with groff; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <stdio.h> +#include "lib.h" + #include <stdlib.h> #include <assert.h> -#include <string.h> #include <errno.h> #include "errarg.h" #include "error.h" -#include "lib.h" #include "stringclass.h" #include "cset.h" #include "cmap.h" |
