Move a few constants out of the libadacl.h header to where they are used.

diff --git a/src/apply-default-acl.c b/src/apply-default-acl.c
index e5b989ad9a585fe6224f16da93e969b34d07358c..7a6705233c4ca4f2f29c5f5cd361e3f07efbdb57 100644 (file)
--- a/src/apply-default-acl.c
+++ b/src/apply-default-acl.c
@@ -20,6 +20,8 @@
 #include "libadacl.h"
 
 
+#define NFTW_ERROR -1
+
 
 /**
  * @brief Determine whether or not the given path is accessible.

diff --git a/src/libadacl.c b/src/libadacl.c
index b25a43b38cba13d055f26ca848241e041fb6d1c7..8e36230c0c09ace1eb85868ecdecc4155cd457ec 100644 (file)
--- a/src/libadacl.c
+++ b/src/libadacl.c
@@ -26,6 +26,15 @@
 #include "libadacl.h"
 
 
+/* Even though most other library functions reliably return -1 for
+ * error, it feels a little wrong to re-use the ACL_ERROR constant.
+ */
+#define CLOSE_ERROR -1
+#define OPEN_ERROR -1
+#define SNPRINTF_ERROR -1
+#define STAT_ERROR -1
+
+
 /**
  * @brief The recursive portion of the @c safe_open function, used to
  *   open a file descriptor in a symlink-safe way when combined with

diff --git a/src/libadacl.h b/src/libadacl.h
index a846c88a3b87da170bb739d3ebead4f72aed609a..c70487ac2a57c84031f307aee5325eaea85478ab 100644 (file)
--- a/src/libadacl.h
+++ b/src/libadacl.h
@@ -6,20 +6,12 @@
  */
 
 /* Most of the libacl functions return 1 for success, 0 for failure,
-   and -1 on error */
+ * and -1 on error. We follow suit.
+*/
 #define ACL_ERROR -1
 #define ACL_FAILURE 0
 #define ACL_SUCCESS 1
 
-/* Even though most other library functions reliably return -1 for
- * error, it feels a little wrong to re-use the ACL_ERROR constant.
- */
-#define CLOSE_ERROR -1
-#define NFTW_ERROR -1
-#define OPEN_ERROR -1
-#define SNPRINTF_ERROR -1
-#define STAT_ERROR -1
-
 int apply_default_acl_ex(const char* path,
                         const struct stat* sp,
                         bool no_exec_mask);