From a663458716eb5a4a9b071170909e5484b03af3a8 Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja.osipov@gmail.com>
Date: Wed, 11 May 2011 18:28:26 +0400
Subject: [PATCH] Bug#769040, review comments.
Move the definition of an auxiliary macro to errcode.c.
Remove a barely justified macro.
---
core/errcode.c | 11 ++++++++++-
include/errcode.h | 11 -----------
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/core/errcode.c b/core/errcode.c
index 442df0209c..f817f4cd18 100644
--- a/core/errcode.c
+++ b/core/errcode.c
@@ -1,3 +1,12 @@
#include <errcode.h>
-ERRCODE_RECORDS(error_codes, ERROR_CODES);
+#define ERRCODE_RECORD_MEMBER(s, f, d) { \
+ .errstr = #s, \
+ .errflags = f, \
+ .errdesc = #d \
+},
+
+struct errcode_record error_codes_records[error_codes_MAX] = {
+ ERROR_CODES(ERRCODE_RECORD_MEMBER)
+};
+
diff --git a/include/errcode.h b/include/errcode.h
index e723ebc560..193d20e2fd 100644
--- a/include/errcode.h
+++ b/include/errcode.h
@@ -11,17 +11,6 @@ struct errcode_record {
const char *errdesc;
};
-#define ERRCODE_RECORD_MEMBER(s, f, d) { \
- .errstr = #s, \
- .errflags = f, \
- .errdesc = #d \
-},
-
-#define ERRCODE_RECORDS(enum_name, enum_members) \
- struct errcode_record enum_name##_records[enum_name##_MAX] = { \
- enum_members(ERRCODE_RECORD_MEMBER) \
- }
-
#define ERRCODE_STR(enum_name, err) (enum_name##_records[err].errstr)
#define ERRCODE_VAL(enum_name, err) (((err) << 8) | enum_name##_records[err].errflags)
#define ERRCODE_DESC(enum_name, err) (enum_name##_records[err].errdesc)
--
GitLab