Move NAME_MAX and PATH_MAX from isc/platform.h to isc/dir.h

The last remaining defines needed for platforms without NAME_MAX and
PATH_MAX (I'm looking at you, GNU Hurd) were moved to isc/dir.h where
it's prevalently used.

diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index fbcd9737d7b080a27af16c6b2da19a1b256630b3..69cc7e0bf256d35876cc4cd153e552d0cca4d7ef 100644 (file)
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -19,6 +19,7 @@
 
 #include <isc/app.h>
 #include <isc/attributes.h>
+#include <isc/dir.h>
 #include <isc/netaddr.h>
 #include <isc/parseint.h>
 #include <isc/platform.h>

diff --git a/bin/dnssec/dnssec-cds.c b/bin/dnssec/dnssec-cds.c
index 4da36c5f9e531a49249a21b6eb33c047e01292bc..b58e62d78e3a8358e4a1c4b4383818e749ab5322 100644 (file)
--- a/bin/dnssec/dnssec-cds.c
+++ b/bin/dnssec/dnssec-cds.c
@@ -24,6 +24,7 @@
 #include <isc/attributes.h>
 #include <isc/buffer.h>
 #include <isc/commandline.h>
+#include <isc/dir.h>
 #include <isc/file.h>
 #include <isc/hash.h>
 #include <isc/mem.h>

diff --git a/bin/dnssec/dnssec-dsfromkey.c b/bin/dnssec/dnssec-dsfromkey.c
index 618ab03cdc891f294dbdbafbf5458df9b6b19aaf..3d607299838fd34441b41627790e7d2aeae67696 100644 (file)
--- a/bin/dnssec/dnssec-dsfromkey.c
+++ b/bin/dnssec/dnssec-dsfromkey.c
@@ -18,6 +18,7 @@
 #include <isc/attributes.h>
 #include <isc/buffer.h>
 #include <isc/commandline.h>
+#include <isc/dir.h>
 #include <isc/hash.h>
 #include <isc/mem.h>
 #include <isc/print.h>

diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index d1ee147277fc98f71e032a88ea6ac1dec827b7c5..4329fe7f0a2f06692c35e20ec47cbfae2c2053a4 100644 (file)
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -36,6 +36,7 @@
 #include <isc/attributes.h>
 #include <isc/base32.h>
 #include <isc/commandline.h>
+#include <isc/dir.h>
 #include <isc/event.h>
 #include <isc/file.h>
 #include <isc/hash.h>

diff --git a/bin/named/geoip.c b/bin/named/geoip.c
index f38b2005053edcfc7181745028d9f5a42d86a7b1..e949d209e9af08d8b3d9295d0a29bb34e1d3984b 100644 (file)
--- a/bin/named/geoip.c
+++ b/bin/named/geoip.c
@@ -15,6 +15,7 @@
 #include <maxminddb.h>
 #endif /* if defined(HAVE_GEOIP2) */
 
+#include <isc/dir.h>
 #include <isc/print.h>
 #include <isc/string.h>
 #include <isc/util.h>

diff --git a/fuzz/fuzz.h b/fuzz/fuzz.h
index 15b2592f7c2cbd1a816cb0cd13c895e8b7ee740a..abbce372edc7060bef594781ef2e60d1c15c7409 100644 (file)
--- a/fuzz/fuzz.h
+++ b/fuzz/fuzz.h
@@ -13,6 +13,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include <isc/dir.h>
 #include <isc/lang.h>
 #include <isc/mem.h>
 #include <isc/once.h>

diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index 50ed64b48e9c8d7a1ded9a1b2783e1826cb2260f..a67f68a3560ac7ba8cafbf93aa4641b97906fe17 100644 (file)
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -23,6 +23,7 @@
 #include <isc/aes.h>
 #include <isc/base64.h>
 #include <isc/buffer.h>
+#include <isc/dir.h>
 #include <isc/file.h>
 #include <isc/hex.h>
 #include <isc/log.h>

diff --git a/lib/dns/journal.c b/lib/dns/journal.c
index 36ebbd17189b66bfb62b5c109932c881fc129867..567692e7a44a2fb7d2f76747083137181e51fdcc 100644 (file)
--- a/lib/dns/journal.c
+++ b/lib/dns/journal.c
@@ -15,6 +15,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#include <isc/dir.h>
 #include <isc/file.h>
 #include <isc/mem.h>
 #include <isc/print.h>

diff --git a/lib/dns/tests/geoip_test.c b/lib/dns/tests/geoip_test.c
index b7020ccc1d1c4c19814c004f8c13c06f8a97e80f..810f8378a68210273e397e817bb297bb1cb7776d 100644 (file)
--- a/lib/dns/tests/geoip_test.c
+++ b/lib/dns/tests/geoip_test.c
@@ -24,6 +24,7 @@
 #include <cmocka.h>
 #include <maxminddb.h>
 
+#include <isc/dir.h>
 #include <isc/print.h>
 #include <isc/string.h>
 #include <isc/types.h>

diff --git a/lib/dns/view.c b/lib/dns/view.c
index dacb875a53d2823d245206e1d3a3b0046a65b777..5de3108d45d71545682751284cdff6c6d52cb304 100644 (file)
--- a/lib/dns/view.c
+++ b/lib/dns/view.c
@@ -20,6 +20,7 @@
 #endif /* ifdef HAVE_LMDB */
 
 #include <isc/atomic.h>
+#include <isc/dir.h>
 #include <isc/file.h>
 #include <isc/hash.h>
 #include <isc/lex.h>

diff --git a/lib/isc/include/isc/dir.h b/lib/isc/include/isc/dir.h
index f42ebe695926f901203219bb3998fb138491bf04..8473f9bba8b0b186909c5ffcb3d810777aad602d 100644 (file)
--- a/lib/isc/include/isc/dir.h
+++ b/lib/isc/include/isc/dir.h
@@ -9,12 +9,12 @@
  * information regarding copyright ownership.
  */
 
-#ifndef ISC_DIR_H
-#define ISC_DIR_H 1
+#pragma once
 
 /*! \file */
 
 #include <dirent.h>
+#include <limits.h>
 
 #include <isc/lang.h>
 #include <isc/platform.h>
@@ -22,6 +22,14 @@
 
 #include <sys/types.h> /* Required on some systems. */
 
+#ifndef NAME_MAX
+#define NAME_MAX 256
+#endif
+
+#ifndef PATH_MAX
+#define PATH_MAX 1024
+#endif
+
 /*% Directory Entry */
 typedef struct isc_direntry {
        char         name[NAME_MAX];
@@ -69,5 +77,3 @@ isc_dir_createunique(char *templet);
  */
 
 ISC_LANG_ENDDECLS
-
-#endif /* ISC_DIR_H */

diff --git a/lib/isc/include/isc/platform.h.in b/lib/isc/include/isc/platform.h.in
index 73dbe80836c561f8e1956cad1f8e64470e646195..ce32692f031111044e6b40bb07821f6a4f23385d 100644 (file)
--- a/lib/isc/include/isc/platform.h.in
+++ b/lib/isc/include/isc/platform.h.in
@@ -18,24 +18,6 @@
  ***** Platform-dependent defines.
  *****/
 
-/***
- *** System limitations
- ***/
-
-#include <limits.h>
-
-#ifndef NAME_MAX
-#define NAME_MAX 256
-#endif
-
-#ifndef PATH_MAX
-#define PATH_MAX 1024
-#endif
-
-#ifndef IOV_MAX
-#define IOV_MAX 1024
-#endif
-
 /*
  * Tell emacs to use C mode for this file.
  *

diff --git a/lib/ns/tests/plugin_test.c b/lib/ns/tests/plugin_test.c
index bf0af1cfd507863a14910be2605a459e171d9163..0e6296c601a474c1d04c020469cc38dfe4df1cdb 100644 (file)
--- a/lib/ns/tests/plugin_test.c
+++ b/lib/ns/tests/plugin_test.c
@@ -24,6 +24,7 @@
 #include <cmocka.h>
 
 #include <isc/attributes.h>
+#include <isc/dir.h>
 #include <isc/mem.h>
 #include <isc/platform.h>
 #include <isc/result.h>