From: Willy Tarreau <w@1wt.eu>
Date: Sun, 28 Oct 2007 10:14:07 +0000 (+0100)
Subject: [MINOR] move error codes to common/errors.h
X-Git-Tag: v1.3.14~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d740babd0e16a40c1ff6727ab301fbb6e94e28c6;p=thirdparty%2Fhaproxy.git

[MINOR] move error codes to common/errors.h

It's useful to be able to share error codes between C files,
so move the codes currently only used in protocols to a generic
file.
---

diff --git a/include/common/errors.h b/include/common/errors.h
new file mode 100644
index 0000000000..48773109c5
--- /dev/null
+++ b/include/common/errors.h
@@ -0,0 +1,46 @@
+/*
+  include/common/errors.h
+  Global error macros and constants
+
+  Copyright (C) 2000-2007 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
+  License as published by the Free Software Foundation, version 2.1
+  exclusively.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef _COMMON_ERRORS_H
+#define _COMMON_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
+ * information to let the caller decide what to do. ERR_WARN and ERR_ALERT
+ * do not indicate any error, just that a message has been put in a shared
+ * buffer in order to be displayed by the caller.
+ */
+#define ERR_NONE	0x00	/* no error, no message returned */
+#define ERR_RETRYABLE	0x01	/* retryable error, may be cumulated */
+#define ERR_FATAL	0x02	/* fatal error, may be cumulated */
+#define ERR_ABORT	0x04	/* it's preferable to end any possible loop */
+#define ERR_WARN	0x08	/* a warning message has been returned */
+#define ERR_ALERT	0x10	/* an alert message has been returned */
+
+
+#endif /* _COMMON_ERRORS_H */
+
+/*
+ * Local variables:
+ *  c-indent-level: 8
+ *  c-basic-offset: 8
+ * End:
+ */
diff --git a/include/types/protocols.h b/include/types/protocols.h
index 6ff4476516..a21f9a4a6c 100644
--- a/include/types/protocols.h
+++ b/include/types/protocols.h
@@ -33,11 +33,6 @@
 /* max length of a protcol name, including trailing zero */
 #define PROTO_NAME_LEN 16
 
-/* return codes for bind_all() */
-#define ERR_NONE	0	/* no error */
-#define ERR_RETRYABLE	1	/* retryable error, may be cumulated */
-#define ERR_FATAL	2	/* fatal error, may be cumulated */
-
 /* listener state */
 #define LI_NEW		0	/* not initialized yet */
 #define LI_INIT		1	/* attached to the protocol, but not listening yet */
diff --git a/src/haproxy.c b/src/haproxy.c
index 1108ea994c..5152a3c632 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -64,6 +64,7 @@
 #include <common/compat.h>
 #include <common/config.h>
 #include <common/defaults.h>
+#include <common/errors.h>
 #include <common/memory.h>
 #include <common/mini-clist.h>
 #include <common/regex.h>
diff --git a/src/proto_uxst.c b/src/proto_uxst.c
index 24c435ff62..307d7ef8e7 100644
--- a/src/proto_uxst.c
+++ b/src/proto_uxst.c
@@ -28,6 +28,7 @@
 #include <common/compat.h>
 #include <common/config.h>
 #include <common/debug.h>
+#include <common/errors.h>
 #include <common/memory.h>
 #include <common/mini-clist.h>
 #include <common/standard.h>
diff --git a/src/proxy.c b/src/proxy.c
index f2967de311..435a1e206b 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -19,6 +19,7 @@
 #include <common/defaults.h>
 #include <common/compat.h>
 #include <common/config.h>
+#include <common/errors.h>
 #include <common/memory.h>
 #include <common/time.h>