INN commit: trunk (20 files)
INN Commit
rra at isc.org
Wed Jan 7 21:34:22 UTC 2015
Date: Wednesday, January 7, 2015 @ 13:34:22
Author: iulius
Revision: 9782
Cleanup in include stuff
- Add missing BEGIN_DECLS/END_DECLS, and also use them instead of their
expansion.
- Add missing inclusion of "inn/portable-macros.h" and "inn/portable-stdbool.h".
Modified:
trunk/authprogs/Makefile
trunk/expire/Makefile
trunk/frontends/Makefile
trunk/include/conffile.h
trunk/include/inn/dbz.h
trunk/include/inn/dispatch.h
trunk/include/inn/inndcomm.h
trunk/include/inn/libinn.h
trunk/include/inn/newsuser.h
trunk/include/inn/ov.h
trunk/include/inn/overview.h
trunk/include/inn/timer.h
trunk/innd/Makefile
trunk/lib/Makefile
trunk/nnrpd/Makefile
trunk/storage/Makefile
trunk/storage/buffindexed/buffindexed.h
trunk/storage/ovdb/ovdb.h
trunk/support/getc-tap-harness
trunk/tests/tap/basic.c
-----------------------------------+
authprogs/Makefile | 7 ++++---
expire/Makefile | 4 ++--
frontends/Makefile | 14 +++++++-------
include/conffile.h | 12 +++++-------
include/inn/dbz.h | 6 +++---
include/inn/dispatch.h | 2 ++
include/inn/inndcomm.h | 17 +++++++----------
include/inn/libinn.h | 6 +++---
include/inn/newsuser.h | 28 +++++++++++++++-------------
include/inn/ov.h | 17 +++++++++--------
include/inn/overview.h | 2 ++
include/inn/timer.h | 2 +-
innd/Makefile | 2 +-
lib/Makefile | 3 ++-
nnrpd/Makefile | 23 ++++++++++++-----------
storage/Makefile | 29 +++++++++++++++--------------
storage/buffindexed/buffindexed.h | 13 +++++++------
storage/ovdb/ovdb.h | 13 +++++++------
support/getc-tap-harness | 2 +-
tests/tap/basic.c | 2 +-
20 files changed, 106 insertions(+), 98 deletions(-)
Modified: authprogs/Makefile
===================================================================
--- authprogs/Makefile 2015-01-07 21:04:11 UTC (rev 9781)
+++ authprogs/Makefile 2015-01-07 21:34:22 UTC (rev 9782)
@@ -132,6 +132,7 @@
../include/inn/innconf.h ../include/inn/defines.h ../include/inn/md5.h \
../include/inn/messages.h ../include/inn/libinn.h \
../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/nntp.h \
- ../include/inn/paths.h ../include/conffile.h libauth.h \
- ../include/portable/socket.h ../include/portable/macros.h \
- ../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h
+ ../include/inn/paths.h ../include/conffile.h \
+ ../include/portable/macros.h libauth.h ../include/portable/socket.h \
+ ../include/portable/macros.h ../include/portable/getaddrinfo.h \
+ ../include/portable/getnameinfo.h
Modified: expire/Makefile
===================================================================
--- expire/Makefile 2015-01-07 21:04:11 UTC (rev 9781)
+++ expire/Makefile 2015-01-07 21:34:22 UTC (rev 9782)
@@ -109,8 +109,8 @@
../include/inn/innconf.h ../include/inn/defines.h \
../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
../include/inn/messages.h ../include/inn/newsuser.h ../include/inn/ov.h \
- ../include/inn/storage.h ../include/inn/options.h \
- ../include/inn/history.h ../include/inn/paths.h ../include/inn/qio.h \
+ ../include/inn/history.h ../include/inn/storage.h \
+ ../include/inn/options.h ../include/inn/paths.h ../include/inn/qio.h \
../include/inn/storage.h
fastrm.o: fastrm.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/macros.h \
Modified: frontends/Makefile
===================================================================
--- frontends/Makefile 2015-01-07 21:04:11 UTC (rev 9781)
+++ frontends/Makefile 2015-01-07 21:34:22 UTC (rev 9782)
@@ -185,8 +185,8 @@
../include/inn/libinn.h ../include/inn/defines.h \
../include/inn/xmalloc.h ../include/inn/xwrite.h \
../include/inn/innconf.h ../include/inn/messages.h ../include/inn/ov.h \
- ../include/inn/storage.h ../include/inn/options.h \
- ../include/inn/history.h ../storage/ovdb/ovdb.h \
+ ../include/inn/history.h ../include/inn/storage.h \
+ ../include/inn/options.h ../storage/ovdb/ovdb.h \
../storage/ovdb/ovdb-private.h
ovdb_monitor.o: ovdb_monitor.c ../include/config.h \
../include/inn/defines.h ../include/inn/system.h ../include/inn/macros.h \
@@ -197,8 +197,8 @@
../include/inn/innconf.h ../include/inn/defines.h \
../include/inn/messages.h ../include/inn/libinn.h \
../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/ov.h \
- ../include/inn/storage.h ../include/inn/options.h \
- ../include/inn/history.h ../storage/ovdb/ovdb.h \
+ ../include/inn/history.h ../include/inn/storage.h \
+ ../include/inn/options.h ../storage/ovdb/ovdb.h \
../storage/ovdb/ovdb-private.h
ovdb_server.o: ovdb_server.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/macros.h \
@@ -213,7 +213,7 @@
../include/inn/defines.h ../include/inn/messages.h \
../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h \
- ../include/inn/ov.h ../include/inn/storage.h ../include/inn/history.h \
+ ../include/inn/ov.h ../include/inn/history.h ../include/inn/storage.h \
../storage/ovdb/ovdb.h ../storage/ovdb/ovdb-private.h
ovdb_stat.o: ovdb_stat.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/macros.h \
@@ -223,8 +223,8 @@
../include/inn/innconf.h ../include/inn/defines.h \
../include/inn/messages.h ../include/inn/libinn.h \
../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/ov.h \
- ../include/inn/storage.h ../include/inn/options.h \
- ../include/inn/history.h ../include/inn/paths.h ../include/inn/storage.h \
+ ../include/inn/history.h ../include/inn/storage.h \
+ ../include/inn/options.h ../include/inn/paths.h ../include/inn/storage.h \
../storage/ovdb/ovdb.h ../storage/ovdb/ovdb-private.h
rnews.o: rnews.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/macros.h \
Modified: include/conffile.h
===================================================================
--- include/conffile.h 2015-01-07 21:04:11 UTC (rev 9781)
+++ include/conffile.h 2015-01-07 21:34:22 UTC (rev 9782)
@@ -1,12 +1,12 @@
-/* $Revision$
+/* $Id$
**
** Data structures, functions and cetera used for config file parsing.
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "portable/macros.h"
+BEGIN_DECLS
+
typedef struct {
FILE *f;
char *buf;
@@ -30,6 +30,4 @@
extern CONFTOKEN *CONFgettoken(CONFTOKEN *, CONFFILE *);
-#ifdef __cplusplus
-}
-#endif
+END_DECLS
Modified: include/inn/dbz.h
===================================================================
--- include/inn/dbz.h 2015-01-07 21:04:11 UTC (rev 9781)
+++ include/inn/dbz.h 2015-01-07 21:34:22 UTC (rev 9782)
@@ -1,5 +1,5 @@
-#ifndef __DBZ_H__
-#define __DBZ_H__
+#ifndef INN_DBZ_H
+#define INN_DBZ_H 1
/* Need the definition of HASH. */
#include "inn/libinn.h"
@@ -71,4 +71,4 @@
END_DECLS
-#endif /* __DBZ_H__ */
+#endif /* INN_DBZ_H */
Modified: include/inn/dispatch.h
===================================================================
--- include/inn/dispatch.h 2015-01-07 21:04:11 UTC (rev 9781)
+++ include/inn/dispatch.h 2015-01-07 21:34:22 UTC (rev 9782)
@@ -10,6 +10,8 @@
#ifndef INN_DISPATCH_H
#define INN_DISPATCH_H 1
+#include "inn/portable-macros.h"
+
/* Forward declarations. */
struct cvector;
Modified: include/inn/inndcomm.h
===================================================================
--- include/inn/inndcomm.h 2015-01-07 21:04:11 UTC (rev 9781)
+++ include/inn/inndcomm.h 2015-01-07 21:34:22 UTC (rev 9782)
@@ -1,4 +1,4 @@
-/* $Revision$
+/* $Id$
**
** Here be values used for communicating with the server once it is
** running.
@@ -7,10 +7,10 @@
#ifndef INN_INNDCOMM_H
#define INN_INNDCOMM_H 1
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#include "inn/portable-macros.h"
+BEGIN_DECLS
+
/* The header for the ICC protocol is a one-byte protocol version followed
by a 2 byte messages length*/
#define HEADER_SIZE (sizeof (ICC_PROTOCOLTYPE) + sizeof (ICC_MSGLENTYPE))
@@ -22,8 +22,6 @@
/* Values for the protocol version field of the message. 8 bits wide. */
#define ICC_PROTOCOL_1 'a'
-
-
#define SC_SEP '\001'
#define SC_MAXFIELDS 6
@@ -89,7 +87,6 @@
# define RECVorREAD(fd, p, s) read((fd), (p), (s))
#endif
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* !INN_INNDCOMM_H */
+END_DECLS
+
+#endif /* INN_INNDCOMM_H */
Modified: include/inn/libinn.h
===================================================================
--- include/inn/libinn.h 2015-01-07 21:04:11 UTC (rev 9781)
+++ include/inn/libinn.h 2015-01-07 21:34:22 UTC (rev 9782)
@@ -3,8 +3,8 @@
** Here be declarations of functions in the InterNetNews library.
*/
-#ifndef LIBINN_H
-#define LIBINN_H 1
+#ifndef INN_LIBINN_H
+#define INN_LIBINN_H 1
#include <inn/defines.h>
#include "inn/xmalloc.h"
@@ -172,4 +172,4 @@
/* <ctype.h>'s isspace includes \n, which is not what we want. */
#define ISWHITE(c) ((c) == ' ' || (c) == '\t')
-#endif /* LIBINN_H */
+#endif /* INN_LIBINN_H */
Modified: include/inn/newsuser.h
===================================================================
--- include/inn/newsuser.h 2015-01-07 21:04:11 UTC (rev 9781)
+++ include/inn/newsuser.h 2015-01-07 21:34:22 UTC (rev 9782)
@@ -1,18 +1,19 @@
-/* $Id$
- *
- * Declarations of functions to ensure running as "news" user/group.
- *
- * By Ivan Shmakov, 2007.
- * This code is in the public domain.
- *
- */
+/* $Id$
+**
+** Declarations of functions to ensure running as "news" user/group.
+**
+** By Ivan Shmakov, 2007.
+** This code is in the public domain.
+*/
-#ifndef RUNASUSER_H
-#define RUNASUSER_H 1
+#ifndef INN_NEWSUSER_H
+#define INN_NEWSUSER_H 1
-#include "config.h"
-#include "clibrary.h"
+#include "inn/portable-macros.h"
+#include "inn/portable-stdbool.h"
+BEGIN_DECLS
+
int get_news_uid_gid(uid_t *uid, gid_t *gid, bool may_die);
/* The following functions die() on failure. */
@@ -20,5 +21,6 @@
void ensure_news_grp(bool may_setgid);
void ensure_news_user_grp(bool may_setuid, bool may_setgid);
-#endif
+END_DECLS
+#endif /* INN_NEWSUSER_H */
Modified: include/inn/ov.h
===================================================================
--- include/inn/ov.h 2015-01-07 21:04:11 UTC (rev 9781)
+++ include/inn/ov.h 2015-01-07 21:34:22 UTC (rev 9782)
@@ -1,12 +1,15 @@
+/* $Id$
+*/
+
#ifndef INN_OV_H
#define INN_OV_H 1
+#include "inn/history.h"
+#include "inn/portable-macros.h"
+#include "inn/portable-stdbool.h"
#include "storage.h"
-#include "inn/history.h"
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+BEGIN_DECLS
#define OV_READ 1
#define OV_WRITE 2
@@ -75,8 +78,6 @@
};
#endif
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+END_DECLS
-#endif /* !INN_OV_H */
+#endif /* INN_OV_H */
Modified: include/inn/overview.h
===================================================================
--- include/inn/overview.h 2015-01-07 21:04:11 UTC (rev 9781)
+++ include/inn/overview.h 2015-01-07 21:34:22 UTC (rev 9782)
@@ -13,6 +13,8 @@
#include <stdio.h> /* FILE */
+#include "inn/portable-macros.h"
+#include "inn/portable-stdbool.h"
#include "inn/storage.h"
/* Forward declarations to avoid unnecessary includes. */
Modified: include/inn/timer.h
===================================================================
--- include/inn/timer.h 2015-01-07 21:04:11 UTC (rev 9781)
+++ include/inn/timer.h 2015-01-07 21:34:22 UTC (rev 9782)
@@ -9,7 +9,7 @@
*/
#ifndef INN_TIMER_H
-#define INN_TIMER_H
+#define INN_TIMER_H 1
#include <inn/defines.h>
Modified: innd/Makefile
===================================================================
--- innd/Makefile 2015-01-07 21:04:11 UTC (rev 9781)
+++ innd/Makefile 2015-01-07 21:34:22 UTC (rev 9782)
@@ -76,8 +76,8 @@
../include/inn/macros.h ../include/portable/stdbool.h \
../include/portable/macros.h ../include/inn/innconf.h \
../include/inn/defines.h ../include/inn/md5.h ../include/inn/ov.h \
- ../include/inn/storage.h ../include/inn/options.h \
../include/inn/history.h ../include/inn/storage.h \
+ ../include/inn/options.h ../include/inn/storage.h \
../include/inn/vector.h ../include/inn/wire.h innd.h \
../include/portable/socket.h ../include/portable/getaddrinfo.h \
../include/portable/getnameinfo.h ../include/inn/buffer.h \
Modified: lib/Makefile
===================================================================
--- lib/Makefile 2015-01-07 21:04:11 UTC (rev 9781)
+++ lib/Makefile 2015-01-07 21:34:22 UTC (rev 9782)
@@ -149,7 +149,8 @@
../include/inn/portable-macros.h ../include/inn/portable-stdbool.h \
../include/inn/options.h ../include/clibrary.h ../include/config.h \
../include/inn/macros.h ../include/portable/stdbool.h \
- ../include/conffile.h ../include/inn/libinn.h ../include/inn/defines.h \
+ ../include/conffile.h ../include/portable/macros.h \
+ ../include/inn/libinn.h ../include/inn/defines.h \
../include/inn/xmalloc.h ../include/inn/xwrite.h
confparse.o: confparse.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/macros.h \
Modified: nnrpd/Makefile
===================================================================
--- nnrpd/Makefile 2015-01-07 21:04:11 UTC (rev 9781)
+++ nnrpd/Makefile 2015-01-07 21:34:22 UTC (rev 9782)
@@ -82,7 +82,7 @@
../include/inn/xwrite.h ../include/inn/nntp.h ../include/inn/paths.h \
../include/inn/storage.h ../include/inn/options.h \
../include/inn/vector.h ../include/inn/timer.h ../include/inn/ov.h \
- ../include/inn/storage.h ../include/inn/history.h tls.h cache.h
+ ../include/inn/history.h ../include/inn/storage.h tls.h cache.h
auth-ext.o: auth-ext.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/macros.h \
../include/inn/portable-macros.h ../include/inn/portable-stdbool.h \
@@ -117,7 +117,7 @@
../include/inn/xwrite.h ../include/inn/nntp.h ../include/inn/paths.h \
../include/inn/storage.h ../include/inn/options.h \
../include/inn/vector.h ../include/inn/timer.h ../include/inn/ov.h \
- ../include/inn/storage.h ../include/inn/history.h
+ ../include/inn/history.h ../include/inn/storage.h
commands.o: commands.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/macros.h \
../include/inn/portable-macros.h ../include/inn/portable-stdbool.h \
@@ -130,7 +130,7 @@
../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h \
../include/inn/vector.h ../include/inn/timer.h ../include/inn/fdflag.h \
../include/inn/portable-socket.h ../include/inn/ov.h \
- ../include/inn/storage.h ../include/inn/history.h \
+ ../include/inn/history.h ../include/inn/storage.h \
../include/inn/innconf.h ../include/inn/messages.h \
../include/inn/version.h tls.h
line.o: line.c ../include/config.h ../include/inn/defines.h \
@@ -156,7 +156,7 @@
../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/nntp.h \
../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h \
../include/inn/vector.h ../include/inn/timer.h ../include/inn/ov.h \
- ../include/inn/storage.h ../include/inn/history.h \
+ ../include/inn/history.h ../include/inn/storage.h \
../include/inn/innconf.h ../include/inn/messages.h
misc.o: misc.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/macros.h \
@@ -170,7 +170,7 @@
../include/inn/xwrite.h ../include/inn/nntp.h ../include/inn/paths.h \
../include/inn/storage.h ../include/inn/options.h \
../include/inn/vector.h ../include/inn/timer.h tls.h ../include/inn/ov.h \
- ../include/inn/storage.h ../include/inn/history.h
+ ../include/inn/history.h ../include/inn/storage.h
newnews.o: newnews.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/macros.h \
../include/inn/portable-macros.h ../include/inn/portable-stdbool.h \
@@ -184,7 +184,7 @@
../include/inn/xwrite.h ../include/inn/nntp.h ../include/inn/paths.h \
../include/inn/storage.h ../include/inn/options.h \
../include/inn/vector.h ../include/inn/timer.h ../include/inn/ov.h \
- ../include/inn/storage.h ../include/inn/history.h cache.h
+ ../include/inn/history.h ../include/inn/storage.h cache.h
nnrpd.o: nnrpd.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/macros.h \
../include/inn/portable-macros.h ../include/inn/portable-stdbool.h \
@@ -197,8 +197,8 @@
../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
../include/inn/messages.h ../include/inn/network.h \
../include/inn/portable-socket.h ../include/inn/network-innbind.h \
- ../include/inn/newsuser.h ../include/inn/ov.h ../include/inn/storage.h \
- ../include/inn/options.h ../include/inn/history.h \
+ ../include/inn/newsuser.h ../include/inn/ov.h ../include/inn/history.h \
+ ../include/inn/storage.h ../include/inn/options.h \
../include/inn/version.h nnrpd.h ../include/inn/qio.h \
../include/inn/nntp.h ../include/inn/paths.h ../include/inn/storage.h \
../include/inn/vector.h ../include/inn/timer.h tls.h
@@ -220,7 +220,8 @@
../include/inn/portable-macros.h ../include/inn/portable-stdbool.h \
../include/inn/options.h ../include/clibrary.h ../include/config.h \
../include/inn/macros.h ../include/portable/stdbool.h \
- ../include/conffile.h ../include/inn/network.h ../include/inn/defines.h \
+ ../include/conffile.h ../include/portable/macros.h \
+ ../include/inn/network.h ../include/inn/defines.h \
../include/inn/portable-socket.h ../include/inn/portable-getaddrinfo.h \
../include/inn/portable-getnameinfo.h ../include/inn/innconf.h \
../include/innperl.h nnrpd.h ../include/portable/macros.h \
@@ -240,7 +241,7 @@
../include/inn/xwrite.h ../include/inn/nntp.h ../include/inn/paths.h \
../include/inn/storage.h ../include/inn/options.h \
../include/inn/vector.h ../include/inn/timer.h ../include/inn/ov.h \
- ../include/inn/storage.h ../include/inn/history.h post.h
+ ../include/inn/history.h ../include/inn/storage.h post.h
python.o: python.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/macros.h \
../include/inn/portable-macros.h ../include/inn/portable-stdbool.h \
@@ -266,7 +267,7 @@
../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/nntp.h \
../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h \
../include/inn/vector.h ../include/inn/timer.h ../include/inn/ov.h \
- ../include/inn/storage.h ../include/inn/history.h
+ ../include/inn/history.h ../include/inn/storage.h
tls.o: tls.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/macros.h \
../include/inn/portable-macros.h ../include/inn/portable-stdbool.h \
Modified: storage/Makefile
===================================================================
--- storage/Makefile 2015-01-07 21:04:11 UTC (rev 9781)
+++ storage/Makefile 2015-01-07 21:34:22 UTC (rev 9782)
@@ -111,15 +111,16 @@
../include/inn/macros.h ../include/portable/stdbool.h \
../include/inn/innconf.h ../include/inn/defines.h \
../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
- ../include/inn/ov.h ../include/inn/storage.h ../include/inn/options.h \
- ../include/inn/history.h ovinterface.h ../include/inn/storage.h \
+ ../include/inn/ov.h ../include/inn/history.h ../include/inn/storage.h \
+ ../include/inn/options.h ovinterface.h ../include/inn/storage.h \
../include/inn/paths.h ../include/inn/vector.h
interface.o: interface.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/macros.h \
../include/inn/portable-macros.h ../include/inn/portable-stdbool.h \
../include/inn/options.h ../include/clibrary.h ../include/config.h \
../include/inn/macros.h ../include/portable/stdbool.h \
- ../include/conffile.h ../include/inn/innconf.h ../include/inn/defines.h \
+ ../include/conffile.h ../include/portable/macros.h \
+ ../include/inn/innconf.h ../include/inn/defines.h \
../include/inn/messages.h ../include/inn/wire.h interface.h \
../include/inn/storage.h ../include/inn/options.h \
../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
@@ -139,8 +140,8 @@
../include/inn/innconf.h ../include/inn/defines.h \
../include/inn/messages.h ../include/inn/wire.h ../include/inn/vector.h \
../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
- ../include/inn/ov.h ../include/inn/storage.h ../include/inn/options.h \
- ../include/inn/history.h ovinterface.h ../include/inn/storage.h \
+ ../include/inn/ov.h ../include/inn/history.h ../include/inn/storage.h \
+ ../include/inn/options.h ovinterface.h ../include/inn/storage.h \
ovmethods.h
overdata.o: overdata.c ../include/config.h ../include/inn/defines.h \
../include/inn/system.h ../include/inn/macros.h \
@@ -163,7 +164,7 @@
../include/inn/overview.h ../include/inn/storage.h \
../include/inn/options.h ../include/inn/wire.h ../include/inn/vector.h \
../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
- ../include/inn/ov.h ../include/inn/storage.h ../include/inn/history.h \
+ ../include/inn/ov.h ../include/inn/history.h ../include/inn/storage.h \
ovinterface.h ovmethods.h
ovmethods.o: ovmethods.c ovinterface.h ../include/config.h \
../include/inn/defines.h ../include/inn/system.h ../include/inn/macros.h \
@@ -180,8 +181,8 @@
../include/portable/mmap.h ../include/inn/innconf.h \
../include/inn/defines.h ../include/inn/messages.h \
../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
- ../include/inn/ov.h ../include/inn/storage.h ../include/inn/options.h \
- ../include/inn/history.h ../include/inn/paths.h ovinterface.h \
+ ../include/inn/ov.h ../include/inn/history.h ../include/inn/storage.h \
+ ../include/inn/options.h ../include/inn/paths.h ovinterface.h \
../include/inn/storage.h ../include/inn/fdflag.h \
../include/inn/portable-socket.h ../include/inn/portable-getaddrinfo.h \
../include/inn/portable-getnameinfo.h buffindexed/shmem.h \
@@ -214,13 +215,13 @@
../include/inn/macros.h ../include/portable/stdbool.h \
../include/portable/socket.h ../include/portable/macros.h \
../include/portable/getaddrinfo.h ../include/portable/getnameinfo.h \
- ../include/conffile.h ../include/inn/fdflag.h \
- ../include/inn/portable-socket.h ../include/inn/innconf.h \
- ../include/inn/defines.h ../include/inn/libinn.h \
- ../include/inn/xmalloc.h ../include/inn/xwrite.h \
+ ../include/conffile.h ../include/portable/macros.h \
+ ../include/inn/fdflag.h ../include/inn/portable-socket.h \
+ ../include/inn/innconf.h ../include/inn/defines.h \
+ ../include/inn/libinn.h ../include/inn/xmalloc.h ../include/inn/xwrite.h \
../include/inn/messages.h ../include/inn/newsuser.h \
../include/inn/paths.h ../include/inn/storage.h ../include/inn/options.h \
- ../include/inn/ov.h ../include/inn/storage.h ../include/inn/history.h \
+ ../include/inn/ov.h ../include/inn/history.h ../include/inn/storage.h \
ovinterface.h ovdb/ovdb.h ovdb/ovdb-private.h \
../include/portable/socket-unix.h
timecaf/caf.o: timecaf/caf.c ../include/config.h ../include/inn/defines.h \
@@ -299,8 +300,8 @@
../include/inn/innconf.h ../include/inn/defines.h \
../include/inn/messages.h ../include/inn/libinn.h \
../include/inn/xmalloc.h ../include/inn/xwrite.h ../include/inn/ov.h \
- ../include/inn/storage.h ../include/inn/options.h \
../include/inn/history.h ../include/inn/storage.h \
+ ../include/inn/options.h ../include/inn/storage.h \
tradindexed/tdx-private.h tradindexed/tdx-structure.h \
tradindexed/tradindexed.h
tradspool/tradspool.o: tradspool/tradspool.c ../include/config.h \
Modified: storage/buffindexed/buffindexed.h
===================================================================
--- storage/buffindexed/buffindexed.h 2015-01-07 21:04:11 UTC (rev 9781)
+++ storage/buffindexed/buffindexed.h 2015-01-07 21:34:22 UTC (rev 9782)
@@ -1,10 +1,13 @@
+/* $Id$
+*/
+
#ifndef _BUFFINDEXED_H_
#define _BUFFINDEXED_H_
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#include "config.h"
+BEGIN_DECLS
+
bool buffindexed_open(int mode);
bool buffindexed_groupstats(const char *group, int *lo, int *hi, int *count,
int *flag);
@@ -23,8 +26,6 @@
bool buffindexed_ctl(OVCTLTYPE type, void *val);
void buffindexed_close(void);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+END_DECLS
#endif /* _BUFFINDEXED_H_ */
Modified: storage/ovdb/ovdb.h
===================================================================
--- storage/ovdb/ovdb.h 2015-01-07 21:04:11 UTC (rev 9781)
+++ storage/ovdb/ovdb.h 2015-01-07 21:34:22 UTC (rev 9782)
@@ -1,10 +1,13 @@
+/* $Id$
+*/
+
#ifndef _OVDB_H_
#define _OVDB_H_
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#include "config.h"
+BEGIN_DECLS
+
bool ovdb_open(int mode);
bool ovdb_groupstats(const char *group, int *lo, int *hi, int *count,
int *flag);
@@ -22,8 +25,6 @@
bool ovdb_ctl(OVCTLTYPE type, void *val);
void ovdb_close(void);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+END_DECLS
#endif /* _OVDB_H_ */
Modified: support/getc-tap-harness
===================================================================
--- support/getc-tap-harness 2015-01-07 21:04:11 UTC (rev 9781)
+++ support/getc-tap-harness 2015-01-07 21:34:22 UTC (rev 9782)
@@ -128,7 +128,7 @@
#endif\\
" \
-e "150 i \\
-#ifndef LIBINN_H" \
+#ifndef INN_LIBINN_H" \
-e "184 i \\
#endif" \
-e 's/^ok.int /new_ok(int /g' \
Modified: tests/tap/basic.c
===================================================================
--- tests/tap/basic.c 2015-01-07 21:04:11 UTC (rev 9781)
+++ tests/tap/basic.c 2015-01-07 21:34:22 UTC (rev 9782)
@@ -194,7 +194,7 @@
* length. When those constraints are relaxed, this should be ripped out and
* replaced with asprintf or a more trivial replacement with snprintf.
*/
-#ifndef LIBINN_H
+#ifndef INN_LIBINN_H
static char *
concat(const char *first, ...)
{
More information about the inn-committers
mailing list