REORG: include: move base64.h, errors.h and hash.h from common to to haproxy/
These ones do not depend on any other file. One used to include
haproxy/api.h but that was solely for stddef.h.
diff --git a/include/common/base64.h b/include/haproxy/base64.h
similarity index 75%
rename from include/common/base64.h
rename to include/haproxy/base64.h
index e53a352..d7dec58 100644
--- a/include/common/base64.h
+++ b/include/haproxy/base64.h
@@ -1,8 +1,8 @@
/*
- * include/common/base64.h
+ * include/haproxy/base64.h
* Ascii to Base64 conversion as described in RFC1421.
*
- * Copyright 2006-2010 Willy Tarreau <w@1wt.eu>
+ * Copyright 2006-2020 Willy Tarreau <w@1wt.eu>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -11,10 +11,10 @@
*
*/
-#ifndef _COMMON_BASE64_H
-#define _COMMON_BASE64_H
+#ifndef _HAPROXY_BASE64_H
+#define _HAPROXY_BASE64_H
-#include <haproxy/api.h>
+#include <stddef.h>
int a2base64(char *in, int ilen, char *out, int olen);
int base64dec(const char *in, size_t ilen, char *out, size_t olen);
@@ -23,4 +23,4 @@
extern const char base64tab[];
-#endif /* _COMMON_BASE64_H */
+#endif /* _HAPROXY_BASE64_H */
diff --git a/include/common/errors.h b/include/haproxy/errors.h
similarity index 93%
rename from include/common/errors.h
rename to include/haproxy/errors.h
index e6b658b..6277701 100644
--- a/include/common/errors.h
+++ b/include/haproxy/errors.h
@@ -1,8 +1,8 @@
/*
- * include/common/errors.h
+ * include/haproxy/errors.h
* Global error macros and constants
*
- * Copyright (C) 2000-2010 Willy Tarreau - w@1wt.eu
+ * Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _COMMON_ERRORS_H
-#define _COMMON_ERRORS_H
+#ifndef _HAPROXY_ERRORS_H
+#define _HAPROXY_ERRORS_H
/* These flags may be used in various functions which are called from within
* loops (eg: to start all listeners from all proxies). They provide enough
@@ -56,7 +56,7 @@
PE_ARG_NOT_FOUND, /* argument references something not found */
};
-#endif /* _COMMON_ERRORS_H */
+#endif /* _HAPROXY_ERRORS_H */
/*
* Local variables:
diff --git a/include/common/hash.h b/include/haproxy/hash.h
similarity index 86%
rename from include/common/hash.h
rename to include/haproxy/hash.h
index c17f8c9..cb506c7 100644
--- a/include/common/hash.h
+++ b/include/haproxy/hash.h
@@ -1,8 +1,8 @@
/*
- * include/common/hash.h
+ * include/haproxy/hash.h
* Macros for different hashing function.
*
- * Copyright (C) 2000-2011 Willy Tarreau - w@1wt.eu
+ * Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _COMMON_HASH_H_
-#define _COMMON_HASH_H_
+#ifndef _HAPROXY_HASH_H_
+#define _HAPROXY_HASH_H_
#include <inttypes.h>
@@ -30,4 +30,4 @@
unsigned int hash_crc32(const void *input, int len);
uint32_t hash_crc32c(const void *input, int len);
-#endif /* _COMMON_HASH_H_ */
+#endif /* _HAPROXY_HASH_H_ */
diff --git a/include/proto/stick_table.h b/include/proto/stick_table.h
index 2243d3d..986c775 100644
--- a/include/proto/stick_table.h
+++ b/include/proto/stick_table.h
@@ -23,7 +23,7 @@
#ifndef _PROTO_STICK_TABLE_H
#define _PROTO_STICK_TABLE_H
-#include <common/errors.h>
+#include <haproxy/errors.h>
#include <common/ticks.h>
#include <common/time.h>
#include <types/stick_table.h>