From 415e0bcc80b350fc75f325b490560f44ba419b20 Mon Sep 17 00:00:00 2001
From: Xavier Hernandez <jahernan@redhat.com>
Date: Tue, 12 Dec 2017 22:31:53 +0100
Subject: all: Simplify component message id's definition

This patch creates a new way of defining message id's that is easier
and less error prone because it doesn't require so many manual changes
each time a new component is defined or a new message created.

Change-Id: I71ba8af9ac068f5add7e74f316a2478bc991c67b
Signed-off-by: Xavier Hernandez <jahernan@redhat.com>
---
 xlators/features/selinux/src/selinux-messages.h | 89 ++++---------------------
 1 file changed, 13 insertions(+), 76 deletions(-)

(limited to 'xlators/features/selinux')

diff --git a/xlators/features/selinux/src/selinux-messages.h b/xlators/features/selinux/src/selinux-messages.h
index a498dc21471..3a1663433ab 100644
--- a/xlators/features/selinux/src/selinux-messages.h
+++ b/xlators/features/selinux/src/selinux-messages.h
@@ -13,86 +13,23 @@
 
 #include "glfs-message-id.h"
 
-/*! \file selinux-messages.h
- *  \brief Selinux log-message IDs and their descriptions
- */
-
-/* NOTE: Rules for message additions
- * 1) Each instance of a message is _better_ left with a unique message ID, even
- *    if the message format is the same. Reasoning is that, if the message
- *    format needs to change in one instance, the other instances are not
- *    impacted or the new change does not change the ID of the instance being
- *    modified.
- * 2) Addition of a message,
- *       - Should increment the GLFS_NUM_MESSAGES
- *       - Append to the list of messages defined, towards the end
- *       - Retain macro naming as glfs_msg_X (for readability across developers)
- * NOTE: Rules for message format modifications
- * 3) Check acorss the code if the message ID macro in question is reused
- *    anywhere. If reused then then the modifications should ensure correctness
- *    everywhere, or needs a new message ID as (1) above was not adhered to. If
- *    not used anywhere, proceed with the required modification.
- * NOTE: Rules for message deletion
- * 4) Check (3) and if used anywhere else, then cannot be deleted. If not used
- *    anywhere, then can be deleted, but will leave a hole by design, as
- *    addition rules specify modification to the end of the list and not filling
- *    holes.
- */
-
-#define GLFS_SL_BASE                GLFS_MSGID_COMP_SL
-#define GLFS_SL_NUM_MESSAGES        5
-#define GLFS_SL_MSGID_END           (GLFS_SL_BASE + GLFS_NUM_MESSAGES + 1)
-/* Messages with message IDs */
-#define glfs_msg_start_x GLFS_SL_BASE, "Invalid: Start of messages"
-/*------------*/
-
-#define SL_MSG_INVALID_VOLFILE          (GLFS_SL_BASE + 1)
-
-/*!
- * @messageid
- * @diagnosis
- * @recommendedaction
+/* To add new message IDs, append new identifiers at the end of the list.
  *
- */
-
-#define SL_MSG_ENOMEM                   (GLFS_SL_BASE + 2)
-
-/*!
- * @messageid
- * @diagnosis
- * @recommendedaction
- *
- */
-
-#define SL_MSG_MEM_ACCT_INIT_FAILED     (GLFS_SL_BASE + 3)
-
-/*!
- * @messageid
- * @diagnosis
- * @recommendedaction
- *
- */
-
-#define SL_MSG_SELINUX_GLUSTER_XATTR_MISSING (GLFS_SL_BASE + 4)
-
-/*!
- * @messageid
- * @diagnosis
- * @recommendedaction
- *
- */
-
-#define SL_MSG_SELINUX_XATTR_MISSING    (GLFS_SL_BASE + 5)
-
-/*!
- * @messageid
- * @diagnosis
- * @recommendedaction
+ * Never remove a message ID. If it's not used anymore, you can rename it or
+ * leave it as it is, but not delete it. This is to prevent reutilization of
+ * IDs by other messages.
  *
+ * The component name must match one of the entries defined in
+ * glfs-message-id.h.
  */
 
-/*-----------*/
-#define glfs_msg_end_x GLFS_MSGID_END, "Invalid: End of messages"
+GLFS_MSGID(SL,
+        SL_MSG_INVALID_VOLFILE,
+        SL_MSG_ENOMEM,
+        SL_MSG_MEM_ACCT_INIT_FAILED,
+        SL_MSG_SELINUX_GLUSTER_XATTR_MISSING,
+        SL_MSG_SELINUX_XATTR_MISSING
+);
 
 #endif /*_SELINUX_MESSAGES_H */
 
-- 
cgit