summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2022-01-16 18:42:23 +0000
committerColin Watson <cjwatson@debian.org>2022-01-16 18:42:23 +0000
commit507b0326798a23ba944d63613c160c0ddb36078e (patch)
tree53edc3565a59483a40fa7635b0568eb10841ecbf /include
parent83df40649a556a9113b1633ef50ded73463a558d (diff)
Move some more declarations out of manconfig.h
Header includes should be in the same translation unit as the code that uses them rather than being ambient across the whole project. * include/manconfig.h: Remove obsolete header comment about program paths. * include/manconfig.h: Remove includes of "xvasprintf.h", <stddef.h>, "xalloc.h", and "xstrndup.h", as well as "struct pipeline" declaration. Update all files that relied on these to include/declare them directly instead as needed. * include/manconfig.h (MAN_DB, mkdbname): Move to ... * libdb/mydbm.h: ... here.
Diffstat (limited to 'include')
-rw-r--r--include/manconfig.h25
1 files changed, 0 insertions, 25 deletions
diff --git a/include/manconfig.h b/include/manconfig.h
index 509cccd3..b3d46972 100644
--- a/include/manconfig.h
+++ b/include/manconfig.h
@@ -21,19 +21,9 @@
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-/*--------------------------------------------------------------------------*/
-/* This file contains the paths/binary locations of the programs used by */
-/* these utilities and various C pre-processor definitions that modify the */
-/* behaviour of the man-db suite. You may like to check that all of the */
-/* formatters are from the same package. Ie, that we are not using a native */
-/* UNIX nroff with GNU tbl. */
-/*--------------------------------------------------------------------------*/
-
#ifndef MANCONFIG_H
#define MANCONFIG_H
-#include "xvasprintf.h"
-
/* STD_SECTIONS must contain all of your man hierarchy subdirectories. The
order is important. Manual pages will be displayed in this order. Ie
if "1" comes before "2", then a kill(1) will be displayed in preference to
@@ -90,10 +80,6 @@
#define DBMODE 0644 /* u=rw,go=r */
-/* The name of the databases. DB_EXT depends on the database type in use */
-#define MAN_DB "/index" DB_EXT
-#define mkdbname(path) xasprintf ("%s%s", path, MAN_DB)
-
/*------------------------------------------------------------------*/
/* The following definitions are best left alone by the uninitiated */
/*------------------------------------------------------------------*/
@@ -175,17 +161,6 @@ struct compression {
extern struct compression comp_list[];
-/*-------------------------------------*/
-/* Now for some function prototypes... */
-/*-------------------------------------*/
-
-/* some library function declarations */
-#include <stddef.h> /* for size_t */
-#include "xalloc.h"
-#include "xstrndup.h"
-
-struct pipeline;
-
extern int quiet; /* be quiet(er) if 1 */
/*--------------------------*/