[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 09/49: [grodvi, ...]: Trivially refactor.
|
From: |
G. Branden Robinson |
|
Subject: |
[groff] 09/49: [grodvi, ...]: Trivially refactor. |
|
Date: |
Sun, 25 Sep 2022 17:02:55 -0400 (EDT) |
gbranden pushed a commit to branch master
in repository groff.
commit 91280c1748c5f008f72684ccf50cdaa3ee77726f
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Mon Sep 19 15:16:16 2022 -0500
[grodvi, ...]: Trivially refactor.
Tidy up #includes of the "assert.h" header, which we locally provide to
ensure a C99-conformant implementation. Drop inclusion of header from
files that don't directly need it, add it where they do, and spell the
inclusion consistently with double quotes to cue the reader of its local
status.
* src/devices/grodvi/dvi.cpp:
* src/devices/grolj4/lj4.cpp:
* src/libs/libdriver/printer.cpp:
* src/preproc/eqn/box.cpp:
* src/preproc/eqn/delim.cpp:
* src/preproc/eqn/pile.cpp:
* src/preproc/eqn/script.cpp: Add inclusion.
* src/include/driver.h:
* src/libs/libgroff/fontfile.cpp:
* src/preproc/eqn/eqn.h:
* src/preproc/html/pushback.cpp:
* src/preproc/refer/refer.h:
* src/preproc/tbl/table.h:
* src/utils/addftinfo/addftinfo.cpp: Drop inclusion.
* src/include/itable.h:
* src/include/stringclass.h:
* src/libs/libbib/linear.cpp:
* src/libs/libbib/search.cpp:
* src/libs/libgroff/color.cpp:
* src/libs/libgroff/font.cpp:
* src/libs/libgroff/nametoindex.cpp:
* src/libs/libgroff/prime.cpp:
* src/libs/libgroff/searchpath.cpp:
* src/preproc/html/pre-html.cpp:
* src/preproc/preconv/preconv.cpp:
* src/preproc/soelim/soelim.cpp:
* src/utils/indxbib/indxbib.cpp:
* src/utils/lkbib/lkbib.cpp:
* src/utils/lookbib/lookbib.cpp: Respell inclusion.
Fixes <https://savannah.gnu.org/bugs/?63079>. Thanks to Bjarni Ingi
Gislason for the report.
Also annotate our assert.h to indicate why it's there.
Also update editor aid comments and drop old style Emacs file-local
variable setting.
---
ChangeLog | 45 +++++++++++++++++++++++++++++++++++++++
src/devices/grodvi/dvi.cpp | 1 +
src/devices/grolj4/lj4.cpp | 8 ++++++-
src/include/assert.h | 5 ++++-
src/include/driver.h | 8 +++++--
src/include/itable.h | 9 +++++---
src/include/ptable.h | 7 ++++--
src/include/stringclass.h | 4 ++--
src/libs/libbib/linear.cpp | 10 +++++++--
src/libs/libbib/search.cpp | 10 +++++++--
src/libs/libdriver/printer.cpp | 1 +
src/libs/libgroff/color.cpp | 4 +++-
src/libs/libgroff/font.cpp | 4 +++-
src/libs/libgroff/fontfile.cpp | 2 --
src/libs/libgroff/nametoindex.cpp | 11 ++++++++--
src/libs/libgroff/prime.cpp | 3 ++-
src/libs/libgroff/searchpath.cpp | 4 ++--
src/preproc/eqn/box.cpp | 8 ++++++-
src/preproc/eqn/delim.cpp | 7 +++++-
src/preproc/eqn/eqn.h | 8 +++++--
src/preproc/eqn/pile.cpp | 7 +++++-
src/preproc/eqn/script.cpp | 8 ++++++-
src/preproc/html/pre-html.cpp | 4 +++-
src/preproc/html/pushback.cpp | 8 +++++--
src/preproc/preconv/preconv.cpp | 4 +++-
src/preproc/refer/refer.h | 8 +++++--
src/preproc/soelim/soelim.cpp | 11 ++++++++--
src/preproc/tbl/table.h | 8 +++++--
src/utils/addftinfo/addftinfo.cpp | 8 +++++--
src/utils/indxbib/indxbib.cpp | 4 ++--
src/utils/lkbib/lkbib.cpp | 10 +++++++--
src/utils/lookbib/lookbib.cpp | 9 ++++++--
32 files changed, 200 insertions(+), 48 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8dbe09bfa..9a851d2dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,48 @@
+2022-09-19 G. Branden Robinson <g.branden.robinson@gmail.com>
+
+ [grodvi, ...]: Trivially refactor.
+
+ Tidy up #includes of the "assert.h" header, which we locally
+ provide to ensure a C99-conformant implementation. Drop
+ inclusion of header from files that don't directly need it, add
+ it where they do, and spell the inclusion consistently with
+ double quotes to cue the reader of its local status.
+
+ * src/devices/grodvi/dvi.cpp:
+ * src/devices/grolj4/lj4.cpp:
+ * src/libs/libdriver/printer.cpp:
+ * src/preproc/eqn/box.cpp:
+ * src/preproc/eqn/delim.cpp:
+ * src/preproc/eqn/pile.cpp:
+ * src/preproc/eqn/script.cpp: Add inclusion.
+
+ * src/include/driver.h:
+ * src/libs/libgroff/fontfile.cpp:
+ * src/preproc/eqn/eqn.h:
+ * src/preproc/html/pushback.cpp:
+ * src/preproc/refer/refer.h:
+ * src/preproc/tbl/table.h:
+ * src/utils/addftinfo/addftinfo.cpp: Drop inclusion.
+
+ * src/include/itable.h:
+ * src/include/stringclass.h:
+ * src/libs/libbib/linear.cpp:
+ * src/libs/libbib/search.cpp:
+ * src/libs/libgroff/color.cpp:
+ * src/libs/libgroff/font.cpp:
+ * src/libs/libgroff/nametoindex.cpp:
+ * src/libs/libgroff/prime.cpp:
+ * src/libs/libgroff/searchpath.cpp:
+ * src/preproc/html/pre-html.cpp:
+ * src/preproc/preconv/preconv.cpp:
+ * src/preproc/soelim/soelim.cpp:
+ * src/utils/indxbib/indxbib.cpp:
+ * src/utils/lkbib/lkbib.cpp:
+ * src/utils/lookbib/lookbib.cpp: Respell inclusion.
+
+ Fixes <https://savannah.gnu.org/bugs/?63079>. Thanks to Bjarni
+ Ingi Gislason for the report.
+
2022-09-18 G. Branden Robinson <g.branden.robinson@gmail.com>
[troff, ...]: Trivially refactor.
diff --git a/src/devices/grodvi/dvi.cpp b/src/devices/grodvi/dvi.cpp
index 7991f8ef0..476067378 100644
--- a/src/devices/grodvi/dvi.cpp
+++ b/src/devices/grodvi/dvi.cpp
@@ -16,6 +16,7 @@ for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#include "assert.h"
#include "driver.h"
#include "nonposix.h"
#include "paper.h"
diff --git a/src/devices/grolj4/lj4.cpp b/src/devices/grolj4/lj4.cpp
index 377c5129f..fa717dbf0 100644
--- a/src/devices/grolj4/lj4.cpp
+++ b/src/devices/grolj4/lj4.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
/* Copyright (C) 1994-2020 Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
@@ -31,6 +30,7 @@ X command to specify inline escape sequence (how to specify
unprintable chars?)
X command to include bitmap graphics
*/
+#include "assert.h"
#include "driver.h"
#include "nonposix.h"
@@ -704,3 +704,9 @@ static void usage(FILE *stream)
" [-w n] [-F dir] [files ...]\n",
program_name);
}
+
+// Local Variables:
+// fill-column: 72
+// mode: C++
+// End:
+// vim: set cindent noexpandtab shiftwidth=2 textwidth=72:
diff --git a/src/include/assert.h b/src/include/assert.h
index 440f0e4be..754cbe65d 100644
--- a/src/include/assert.h
+++ b/src/include/assert.h
@@ -1,4 +1,3 @@
-// -*- C++ -*-
/* Copyright (C) 1989-2020 Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
@@ -20,6 +19,10 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
#ifndef ASSERT_H
#define ASSERT_H
+// C99 requires that the diagnostic emitted by assert() contain the
+// failing expression and name of the function in scope. Define our own
+// macro to ensure this even in ISO C90 systems that don't.
+
void assertion_failed(int, const char *, const char *, const char *);
inline void do_assert(int expr, int line, const char *file,
diff --git a/src/include/driver.h b/src/include/driver.h
index 0335b5b2a..965ac1abe 100644
--- a/src/include/driver.h
+++ b/src/include/driver.h
@@ -1,4 +1,3 @@
-// -*- C++ -*-
/* Copyright (C) 1989-2020 Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
@@ -23,7 +22,6 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
#include <stdlib.h>
#include <stddef.h>
#include <errno.h>
-#include <assert.h>
#include <math.h>
#include "errarg.h"
#include "error.h"
@@ -32,3 +30,9 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
#include "geometry.h"
void do_file(const char *);
+
+// Local Variables:
+// fill-column: 72
+// mode: C++
+// End:
+// vim: set cindent noexpandtab shiftwidth=2 textwidth=72:
diff --git a/src/include/itable.h b/src/include/itable.h
index 6ea867091..5808f2301 100644
--- a/src/include/itable.h
+++ b/src/include/itable.h
@@ -1,4 +1,3 @@
-// -*- C++ -*-
/* Copyright (C) 1989-2020 Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
@@ -17,7 +16,7 @@ for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#include <assert.h>
+#include "assert.h"
// 'class ITABLE(T)' is the type of a hash table mapping an integer (int >= 0)
// to an object of type T.
@@ -187,4 +186,8 @@ int ITABLE_ITERATOR(T)::next(int *keyp, T **valp)
\
return 0; \
}
-// end of itable.h
+// Local Variables:
+// fill-column: 72
+// mode: C++
+// End:
+// vim: set cindent noexpandtab shiftwidth=2 textwidth=72:
diff --git a/src/include/ptable.h b/src/include/ptable.h
index edbf74ffb..fa792936b 100644
--- a/src/include/ptable.h
+++ b/src/include/ptable.h
@@ -1,4 +1,3 @@
-// -*- C++ -*-
/* Copyright (C) 1989-2020 Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
@@ -227,4 +226,8 @@ int PTABLE_ITERATOR(T)::next(const char **keyp, T **valp)
\
return 0; \
}
-// end of ptable.h
+// Local Variables:
+// fill-column: 72
+// mode: C++
+// End:
+// vim: set cindent noexpandtab shiftwidth=2 textwidth=72:
diff --git a/src/include/stringclass.h b/src/include/stringclass.h
index 3fe9afe9f..aadf07116 100644
--- a/src/include/stringclass.h
+++ b/src/include/stringclass.h
@@ -1,4 +1,3 @@
-// -*- C++ -*-
/* Copyright (C) 1989-2020 Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
@@ -19,7 +18,8 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
#include <string.h>
#include <stdio.h>
-#include <assert.h>
+
+#include "assert.h"
// Ensure that the first declaration of functions that are later
// declared as inline declares them as inline.
diff --git a/src/libs/libbib/linear.cpp b/src/libs/libbib/linear.cpp
index 69fb6fcb4..13f6a06bd 100644
--- a/src/libs/libbib/linear.cpp
+++ b/src/libs/libbib/linear.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
/* Copyright (C) 1989-2020 Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
@@ -20,9 +19,10 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
#include "lib.h"
#include <stdlib.h>
-#include <assert.h>
#include <errno.h>
+#include "assert.h"
+
#include "posix.h"
#include "errarg.h"
#include "error.h"
@@ -499,3 +499,9 @@ int linear_search_item_iterator::next(const linear_searcher
&searcher,
else
return 0;
}
+
+// Local Variables:
+// fill-column: 72
+// mode: C++
+// End:
+// vim: set cindent noexpandtab shiftwidth=2 textwidth=72:
diff --git a/src/libs/libbib/search.cpp b/src/libs/libbib/search.cpp
index ba5ebb7a4..27c000f68 100644
--- a/src/libs/libbib/search.cpp
+++ b/src/libs/libbib/search.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
/* Copyright (C) 1989-2020 Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
@@ -20,9 +19,10 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
#include "lib.h"
#include <stdlib.h>
-#include <assert.h>
#include <errno.h>
+#include "assert.h"
+
#include "posix.h"
#include "errarg.h"
#include "error.h"
@@ -129,3 +129,9 @@ int search_item::next_filename_id() const
search_item_iterator::~search_item_iterator()
{
}
+
+// Local Variables:
+// fill-column: 72
+// mode: C++
+// End:
+// vim: set cindent noexpandtab shiftwidth=2 textwidth=72:
diff --git a/src/libs/libdriver/printer.cpp b/src/libs/libdriver/printer.cpp
index d7877eda9..b7922d740 100644
--- a/src/libs/libdriver/printer.cpp
+++ b/src/libs/libdriver/printer.cpp
@@ -17,6 +17,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "assert.h"
#include "driver.h"
/* If we are sending output to an onscreen pager (as is the normal case
diff --git a/src/libs/libgroff/color.cpp b/src/libs/libgroff/color.cpp
index 91c68d8fe..b9cd0dda6 100644
--- a/src/libs/libgroff/color.cpp
+++ b/src/libs/libgroff/color.cpp
@@ -23,10 +23,12 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
#include <unistd.h>
#endif
-#include <assert.h>
#include <stdio.h>
#include <fcntl.h>
#include <stdlib.h>
+
+#include "assert.h"
+
#include "errarg.h"
#include "error.h"
diff --git a/src/libs/libgroff/font.cpp b/src/libs/libgroff/font.cpp
index 292aa5e1e..1bf5c6587 100644
--- a/src/libs/libgroff/font.cpp
+++ b/src/libs/libgroff/font.cpp
@@ -19,10 +19,12 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
#include "lib.h"
#include <ctype.h>
-#include <assert.h>
#include <math.h>
#include <stdlib.h>
#include <wchar.h>
+
+#include "assert.h"
+
#include "errarg.h"
#include "error.h"
#include "cset.h"
diff --git a/src/libs/libgroff/fontfile.cpp b/src/libs/libgroff/fontfile.cpp
index f468acca2..898797146 100644
--- a/src/libs/libgroff/fontfile.cpp
+++ b/src/libs/libgroff/fontfile.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
/* Copyright (C) 1989-2020 Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
@@ -19,7 +18,6 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
#include "lib.h"
-#include <assert.h>
#include <stdlib.h>
#include <errno.h>
#include "font.h"
diff --git a/src/libs/libgroff/nametoindex.cpp
b/src/libs/libgroff/nametoindex.cpp
index a8d628cbd..8f1256c86 100644
--- a/src/libs/libgroff/nametoindex.cpp
+++ b/src/libs/libgroff/nametoindex.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
/* Copyright (C) 1989-2020 Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
@@ -20,8 +19,10 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
#include "lib.h"
#include <ctype.h>
-#include <assert.h>
#include <stdlib.h>
+
+#include "assert.h"
+
#include "errarg.h"
#include "error.h"
#include "font.h"
@@ -159,3 +160,9 @@ const char *glyph_to_name(glyph *g)
charinfo *ci = (charinfo *)g; // Every glyph is actually a charinfo.
return ci->name;
}
+
+// Local Variables:
+// fill-column: 72
+// mode: C++
+// End:
+// vim: set cindent noexpandtab shiftwidth=2 textwidth=72:
diff --git a/src/libs/libgroff/prime.cpp b/src/libs/libgroff/prime.cpp
index 96001acc2..83227b178 100644
--- a/src/libs/libgroff/prime.cpp
+++ b/src/libs/libgroff/prime.cpp
@@ -18,9 +18,10 @@ internet at <http://www.gnu.org/licenses/gpl-2.0.txt>. */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
-#include <assert.h>
#include <math.h>
+#include "assert.h"
+
bool is_prime(unsigned n)
{
assert(n > 1);
diff --git a/src/libs/libgroff/searchpath.cpp b/src/libs/libgroff/searchpath.cpp
index b6921bac9..742ab0b6c 100644
--- a/src/libs/libgroff/searchpath.cpp
+++ b/src/libs/libgroff/searchpath.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
/* Copyright (C) 1989-2020 Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
@@ -20,9 +19,10 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
#include "lib.h"
#include <stdlib.h>
-#include <assert.h>
#include <errno.h>
+#include "assert.h"
+
#include "searchpath.h"
#include "nonposix.h"
diff --git a/src/preproc/eqn/box.cpp b/src/preproc/eqn/box.cpp
index df051bb67..cbdde11b2 100644
--- a/src/preproc/eqn/box.cpp
+++ b/src/preproc/eqn/box.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
/* Copyright (C) 1989-2020 Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
@@ -17,6 +16,7 @@ for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#include "assert.h"
#include "eqn.h"
#include "pbox.h"
@@ -642,3 +642,9 @@ void tab_box::debug_print()
{
fprintf(stderr, "<tab>");
}
+
+// Local Variables:
+// fill-column: 72
+// mode: C++
+// End:
+// vim: set cindent noexpandtab shiftwidth=2 textwidth=72:
diff --git a/src/preproc/eqn/delim.cpp b/src/preproc/eqn/delim.cpp
index c6676532b..8bb5a3a7f 100644
--- a/src/preproc/eqn/delim.cpp
+++ b/src/preproc/eqn/delim.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
/* Copyright (C) 1989-2020 Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
@@ -17,6 +16,7 @@ for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#include "assert.h"
#include "eqn.h"
#include "pbox.h"
@@ -410,3 +410,8 @@ void delim_box::debug_print()
fprintf(stderr, " right \"%s\"", right);
}
+// Local Variables:
+// fill-column: 72
+// mode: C++
+// End:
+// vim: set cindent noexpandtab shiftwidth=2 textwidth=72:
diff --git a/src/preproc/eqn/eqn.h b/src/preproc/eqn/eqn.h
index 878b120d5..a4143cbc5 100644
--- a/src/preproc/eqn/eqn.h
+++ b/src/preproc/eqn/eqn.h
@@ -1,4 +1,3 @@
-// -*- C++ -*-
/* Copyright (C) 1989-2020 Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
@@ -19,7 +18,6 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
#include "lib.h"
-#include <assert.h>
#include <stdlib.h>
#include <errno.h>
#include "cset.h"
@@ -51,3 +49,9 @@ void init_table(const char *device);
// prefix for all registers, strings, macros
#define PREFIX "0"
+
+// Local Variables:
+// fill-column: 72
+// mode: C++
+// End:
+// vim: set cindent noexpandtab shiftwidth=2 textwidth=72:
diff --git a/src/preproc/eqn/pile.cpp b/src/preproc/eqn/pile.cpp
index bd4b5e0ae..a280319e7 100644
--- a/src/preproc/eqn/pile.cpp
+++ b/src/preproc/eqn/pile.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
/* Copyright (C) 1989-2020 Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
@@ -18,6 +17,7 @@ You should have received a copy of the GNU General Public
License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
// piles and matrices
+#include "assert.h"
#include "eqn.h"
#include "pbox.h"
@@ -345,3 +345,8 @@ void column::debug_print(const char *s)
fprintf(stderr, " }");
}
+// Local Variables:
+// fill-column: 72
+// mode: C++
+// End:
+// vim: set cindent noexpandtab shiftwidth=2 textwidth=72:
diff --git a/src/preproc/eqn/script.cpp b/src/preproc/eqn/script.cpp
index 9ec8e4b1a..10352b500 100644
--- a/src/preproc/eqn/script.cpp
+++ b/src/preproc/eqn/script.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
/* Copyright (C) 1989-2020 Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
@@ -17,6 +16,7 @@ for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+#include "assert.h"
#include "eqn.h"
#include "pbox.h"
@@ -241,3 +241,9 @@ void script_box::check_tabs(int level)
sub->check_tabs(level + 1);
p->check_tabs(level);
}
+
+// Local Variables:
+// fill-column: 72
+// mode: C++
+// End:
+// vim: set cindent noexpandtab shiftwidth=2 textwidth=72:
diff --git a/src/preproc/html/pre-html.cpp b/src/preproc/html/pre-html.cpp
index 4f2dfdc30..1acc1ec4b 100644
--- a/src/preproc/html/pre-html.cpp
+++ b/src/preproc/html/pre-html.cpp
@@ -25,9 +25,11 @@
#include <signal.h>
#include <ctype.h>
-#include <assert.h>
#include <stdlib.h>
#include <errno.h>
+
+#include "assert.h"
+
#include "errarg.h"
#include "error.h"
#include "stringclass.h"
diff --git a/src/preproc/html/pushback.cpp b/src/preproc/html/pushback.cpp
index bc3940c28..100ac0bac 100644
--- a/src/preproc/html/pushback.cpp
+++ b/src/preproc/html/pushback.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
/* Copyright (C) 2000-2020 Free Software Foundation, Inc.
Written by Gaius Mulley (gaius@glam.ac.uk).
@@ -21,7 +20,6 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
#include <signal.h>
#include <ctype.h>
-#include <assert.h>
#include <stdlib.h>
#include <errno.h>
#include "errarg.h"
@@ -330,3 +328,9 @@ char *pushBackBuffer::readString (void)
}
return( str );
}
+
+// Local Variables:
+// fill-column: 72
+// mode: C++
+// End:
+// vim: set cindent noexpandtab shiftwidth=2 textwidth=72:
diff --git a/src/preproc/preconv/preconv.cpp b/src/preproc/preconv/preconv.cpp
index b1027af17..c77a756b5 100644
--- a/src/preproc/preconv/preconv.cpp
+++ b/src/preproc/preconv/preconv.cpp
@@ -18,13 +18,15 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
#include "lib.h"
-#include <assert.h>
#include <stdlib.h>
#include <errno.h>
#include <sys/stat.h>
#ifdef HAVE_UCHARDET
#include <uchardet/uchardet.h>
#endif
+
+#include "assert.h"
+
#include "errarg.h"
#include "error.h"
#include "localcharset.h"
diff --git a/src/preproc/refer/refer.h b/src/preproc/refer/refer.h
index 80041667f..3ebff277f 100644
--- a/src/preproc/refer/refer.h
+++ b/src/preproc/refer/refer.h
@@ -1,4 +1,3 @@
-// -*- C++ -*-
/* Copyright (C) 1989-2020 Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
@@ -20,7 +19,6 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
#include "lib.h"
#include <stdlib.h>
-#include <assert.h>
#include <errno.h>
#include "errarg.h"
@@ -75,3 +73,9 @@ void command_error(const char *,
class reference;
void compute_labels(reference **, int);
+
+// Local Variables:
+// fill-column: 72
+// mode: C++
+// End:
+// vim: set cindent noexpandtab shiftwidth=2 textwidth=72:
diff --git a/src/preproc/soelim/soelim.cpp b/src/preproc/soelim/soelim.cpp
index 0c379d1d8..a52974973 100644
--- a/src/preproc/soelim/soelim.cpp
+++ b/src/preproc/soelim/soelim.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
/* Copyright (C) 1989-2020 Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
@@ -20,9 +19,11 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
#include "lib.h"
#include <ctype.h>
-#include <assert.h>
#include <stdlib.h>
#include <errno.h>
+
+#include "assert.h"
+
#include "errarg.h"
#include "error.h"
#include "stringclass.h"
@@ -304,3 +305,9 @@ int do_file(const char *filename)
current_filename = 0;
return 1;
}
+
+// Local Variables:
+// fill-column: 72
+// mode: C++
+// End:
+// vim: set cindent noexpandtab shiftwidth=2 textwidth=72:
diff --git a/src/preproc/tbl/table.h b/src/preproc/tbl/table.h
index 00d1c712a..c703fb1cd 100644
--- a/src/preproc/tbl/table.h
+++ b/src/preproc/tbl/table.h
@@ -1,4 +1,3 @@
-// -*- C++ -*-
/* Copyright (C) 1989-2020 Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
@@ -20,7 +19,6 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
#include "lib.h"
#include <stdlib.h>
-#include <assert.h>
#include <ctype.h>
#include <errno.h>
@@ -169,3 +167,9 @@ public:
void set_troff_location(const char *, int);
extern int compatible_flag;
+
+// Local Variables:
+// fill-column: 72
+// mode: C++
+// End:
+// vim: set cindent noexpandtab shiftwidth=2 textwidth=72:
diff --git a/src/utils/addftinfo/addftinfo.cpp
b/src/utils/addftinfo/addftinfo.cpp
index 7b4df6c4b..39b8a0f9c 100644
--- a/src/utils/addftinfo/addftinfo.cpp
+++ b/src/utils/addftinfo/addftinfo.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
/* Copyright (C) 1989-2020 Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
@@ -20,7 +19,6 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
#include "lib.h"
#include <ctype.h>
-#include <assert.h>
#include <stdlib.h>
#include <errno.h>
#include "errarg.h"
@@ -231,3 +229,9 @@ static void convert_font(const font_params ¶m, FILE
*infp,
fputs(p, outfp);
}
}
+
+// Local Variables:
+// fill-column: 72
+// mode: C++
+// End:
+// vim: set cindent noexpandtab shiftwidth=2 textwidth=72:
diff --git a/src/utils/indxbib/indxbib.cpp b/src/utils/indxbib/indxbib.cpp
index e06f4d405..229c226b2 100644
--- a/src/utils/indxbib/indxbib.cpp
+++ b/src/utils/indxbib/indxbib.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
/* Copyright (C) 1989-2020 Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
@@ -20,9 +19,10 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
#include "lib.h"
#include <stdlib.h>
-#include <assert.h>
#include <errno.h>
+#include "assert.h"
+
#include "posix.h"
#include "errarg.h"
#include "error.h"
diff --git a/src/utils/lkbib/lkbib.cpp b/src/utils/lkbib/lkbib.cpp
index 6d9195600..93af8b8ae 100644
--- a/src/utils/lkbib/lkbib.cpp
+++ b/src/utils/lkbib/lkbib.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
/* Copyright (C) 1989-2020 Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
@@ -21,7 +20,8 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
#include <stdlib.h>
#include <errno.h>
-#include <assert.h>
+
+#include "assert.h"
#include "errarg.h"
#include "error.h"
@@ -134,3 +134,9 @@ int main(int argc, char **argv)
}
return !count;
}
+
+// Local Variables:
+// fill-column: 72
+// mode: C++
+// End:
+// vim: set cindent noexpandtab shiftwidth=2 textwidth=72:
diff --git a/src/utils/lookbib/lookbib.cpp b/src/utils/lookbib/lookbib.cpp
index d8865b439..9ffa85028 100644
--- a/src/utils/lookbib/lookbib.cpp
+++ b/src/utils/lookbib/lookbib.cpp
@@ -1,4 +1,3 @@
-// -*- C++ -*-
/* Copyright (C) 1989-2020 Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
@@ -20,9 +19,10 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
#include "lib.h"
#include <stdlib.h>
-#include <assert.h>
#include <errno.h>
+#include "assert.h"
+
#include "errarg.h"
#include "error.h"
#include "cset.h"
@@ -137,3 +137,8 @@ int main(int argc, char **argv)
return 0;
}
+// Local Variables:
+// fill-column: 72
+// mode: C++
+// End:
+// vim: set cindent noexpandtab shiftwidth=2 textwidth=72:
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 09/49: [grodvi, ...]: Trivially refactor.,
G. Branden Robinson <=