e_info_protocol: make an internal header

Move the internal resources and the function declaration
to the internal header

Change-Id: Ia4cd97862b09eaca7a18ac951e5071fafde9adc5

diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index 303ec7dcd55ee68c4b82b7e76ea4f4df93974ef4..71d8f348d71b894d6ba823bd507941a26eeec4f4 100644 (file)
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -72,7 +72,6 @@ src/bin/e_utils.h \
 src/bin/e_zone.h \
 src/bin/e_util_transform.h \
 src/bin/e_comp_screen.h \
-src/bin/e_info_protocol.h \
 src/bin/e_comp_wl_input.h \
 src/bin/e_comp_wl.h \
 src/bin/e_hwc.h \

diff --git a/src/bin/e_info_protocol.c b/src/bin/e_info_protocol.c
index 521146485fbaef8bb3742f380ceb1e56e0c8da88..76a1a36d4799fb36cc053ae6e62dccad18322d55 100644 (file)
--- a/src/bin/e_info_protocol.c
+++ b/src/bin/e_info_protocol.c
@@ -1,5 +1,5 @@
 #include "e.h"
-#include "e_info_protocol.h"
+#include "e_info_protocol_intern.h"
 
 static E_Info_Rule_Checker *rc = NULL;
 

diff --git a/src/bin/e_info_protocol.h b/src/bin/e_info_protocol.h
deleted file mode 100644 (file)
index 46ba8eb..0000000
--- a/src/bin/e_info_protocol.h
+++ /dev/null
@@ -1,156 +0,0 @@
-#ifndef _E_INFO_PROTOCOL_H_
-#define _E_INFO_PROTOCOL_H_
-
-#define STRING_MAX 64
-#define MAX_RULE   64
-
-#ifndef REPLY
-#define REPLY(fmt, ARG...)  \
-   do { \
-        if (reply && len && *len > 0) \
-          { \
-             int s = snprintf(reply, *len, fmt, ##ARG); \
-             reply += s; \
-             *len -= s; \
-          } \
-     } while (0)
-#endif
-
-typedef struct _E_Info_Tree_Node    E_Info_Tree_Node;
-typedef struct _E_Info_Tree         E_Info_Tree;
-typedef struct _E_Info_Token_Data   E_Info_Token_Data;
-typedef struct _E_Info_Rule_Node    E_Info_Rule_Node;
-typedef struct _E_Info_Rule         E_Info_Rule;
-typedef struct _E_Info_Rule_Checker E_Info_Rule_Checker;
-typedef struct _E_Info_Protocol_Log E_Info_Protocol_Log;
-
-typedef int (*E_Info_Tree_Traverse_Cb) (E_Info_Tree *tree, E_Info_Tree_Node *node, E_Info_Tree_Node *parent, void * arg);
-
-struct _E_Info_Tree_Node
-{
-   E_Info_Tree_Node *left;
-   E_Info_Tree_Node *right;
-};
-
-struct _E_Info_Tree
-{
-   int               size;
-   E_Info_Tree_Node *head;
-};
-
-typedef enum
-{
-   E_INFO_TOKEN_UNKNOWN = 0,
-   E_INFO_TOKEN_L_BR = 1,
-   E_INFO_TOKEN_R_BR = 2,
-   E_INFO_TOKEN_NOT_EQ = 3,
-   E_INFO_TOKEN_EQUAL = 4,
-   E_INFO_TOKEN_LSS_THAN = 5,
-   E_INFO_TOKEN_LSS_EQ = 6,
-   E_INFO_TOKEN_GRT_THAN = 7,
-   E_INFO_TOKEN_GRT_EQ = 8,
-   E_INFO_TOKEN_AND = 9,
-   E_INFO_TOKEN_OR = 10,
-   E_INFO_TOKEN_SPACE = 11,
-   E_INFO_TOKEN_SYMBOL = 12,
-   E_INFO_TOKEN_NUMBER = 13,
-   E_INFO_TOKEN_EOS = 14,
-} E_Info_Token;
-
-struct _E_Info_Token_Data
-{
-   const char **string;
-   E_Info_Token last_token;
-   const char  *last_symbol;
-   int          symbol_len;
-};
-
-typedef enum
-{
-   E_INFO_NODE_TYPE_NONE,
-   E_INFO_NODE_TYPE_AND,
-   E_INFO_NODE_TYPE_OR,
-   E_INFO_NODE_TYPE_DATA,
-   E_INFO_NODE_TYPE_ALL
-} E_Info_Node_Type;
-
-typedef enum
-{
-   E_INFO_COMPARER_EQUAL,
-   E_INFO_COMPARER_LESS,
-   E_INFO_COMPARER_GREATER,
-   E_INFO_COMPARER_LESS_EQ,
-   E_INFO_COMPARER_GREATER_EQ,
-   E_INFO_COMPARER_NOT_EQ
-} E_Info_Comparer;
-
-typedef enum
-{
-   E_INFO_DATA_TYPE_INTEGER,
-   E_INFO_DATA_TYPE_STRING
-} E_Info_Data_Type;
-
-typedef enum
-{
-   E_INFO_RESULT_UNKNOWN,
-   E_INFO_RESULT_TRUE,
-   E_INFO_RESULT_FALSE
-} E_Info_Result_Type;
-
-struct _E_Info_Rule_Node
-{
-   E_Info_Node_Type node_type;
-
-   char             variable_name[STRING_MAX];
-   E_Info_Comparer  comparer;
-   E_Info_Data_Type value_type;
-
-   union
-   {
-      char string[STRING_MAX];
-      int  integer;
-   } value;
-
-   E_Info_Result_Type result;
-};
-
-typedef enum
-{
-   E_INFO_POLICY_TYPE_UNDEFINED,
-   E_INFO_POLICY_TYPE_ALLOW,
-   E_INFO_POLICY_TYPE_DENY
-} E_Info_Policy_Type;
-
-struct _E_Info_Rule
-{
-   E_Info_Policy_Type policy;
-   E_Info_Tree       *tree;
-};
-
-struct _E_Info_Rule_Checker
-{
-   E_Info_Rule rules[MAX_RULE];
-   int         count;
-};
-
-typedef enum
-{
-   E_INFO_PROTOCOL_TYPE_REQUEST,
-   E_INFO_PROTOCOL_TYPE_EVENT,
-} E_Info_Protocol_Type;
-
-struct _E_Info_Protocol_Log
-{
-   E_Info_Protocol_Type type;
-   int                  client_pid;
-   int                  target_id;
-   char                 name[PATH_MAX + 1];
-   char                 cmd[PATH_MAX + 1];
-};
-
-EINTERN void      e_info_protocol_init();
-EINTERN void      e_info_protocol_shutdown();
-
-EINTERN Eina_Bool e_info_protocol_rule_set(const int argc, const char **argv, char *reply, int *len);
-EINTERN Eina_Bool e_info_protocol_rule_validate(E_Info_Protocol_Log *log);
-#endif

diff --git a/src/bin/e_info_protocol_intern.h b/src/bin/e_info_protocol_intern.h
new file mode 100644 (file)
index 0000000..46ba8eb
--- /dev/null
+++ b/src/bin/e_info_protocol_intern.h
@@ -0,0 +1,156 @@
+#ifndef _E_INFO_PROTOCOL_H_
+#define _E_INFO_PROTOCOL_H_
+
+#define STRING_MAX 64
+#define MAX_RULE   64
+
+#ifndef REPLY
+#define REPLY(fmt, ARG...)  \
+   do { \
+        if (reply && len && *len > 0) \
+          { \
+             int s = snprintf(reply, *len, fmt, ##ARG); \
+             reply += s; \
+             *len -= s; \
+          } \
+     } while (0)
+#endif
+
+typedef struct _E_Info_Tree_Node    E_Info_Tree_Node;
+typedef struct _E_Info_Tree         E_Info_Tree;
+typedef struct _E_Info_Token_Data   E_Info_Token_Data;
+typedef struct _E_Info_Rule_Node    E_Info_Rule_Node;
+typedef struct _E_Info_Rule         E_Info_Rule;
+typedef struct _E_Info_Rule_Checker E_Info_Rule_Checker;
+typedef struct _E_Info_Protocol_Log E_Info_Protocol_Log;
+
+typedef int (*E_Info_Tree_Traverse_Cb) (E_Info_Tree *tree, E_Info_Tree_Node *node, E_Info_Tree_Node *parent, void * arg);
+
+struct _E_Info_Tree_Node
+{
+   E_Info_Tree_Node *left;
+   E_Info_Tree_Node *right;
+};
+
+struct _E_Info_Tree
+{
+   int               size;
+   E_Info_Tree_Node *head;
+};
+
+typedef enum
+{
+   E_INFO_TOKEN_UNKNOWN = 0,
+   E_INFO_TOKEN_L_BR = 1,
+   E_INFO_TOKEN_R_BR = 2,
+   E_INFO_TOKEN_NOT_EQ = 3,
+   E_INFO_TOKEN_EQUAL = 4,
+   E_INFO_TOKEN_LSS_THAN = 5,
+   E_INFO_TOKEN_LSS_EQ = 6,
+   E_INFO_TOKEN_GRT_THAN = 7,
+   E_INFO_TOKEN_GRT_EQ = 8,
+   E_INFO_TOKEN_AND = 9,
+   E_INFO_TOKEN_OR = 10,
+   E_INFO_TOKEN_SPACE = 11,
+   E_INFO_TOKEN_SYMBOL = 12,
+   E_INFO_TOKEN_NUMBER = 13,
+   E_INFO_TOKEN_EOS = 14,
+} E_Info_Token;
+
+struct _E_Info_Token_Data
+{
+   const char **string;
+   E_Info_Token last_token;
+   const char  *last_symbol;
+   int          symbol_len;
+};
+
+typedef enum
+{
+   E_INFO_NODE_TYPE_NONE,
+   E_INFO_NODE_TYPE_AND,
+   E_INFO_NODE_TYPE_OR,
+   E_INFO_NODE_TYPE_DATA,
+   E_INFO_NODE_TYPE_ALL
+} E_Info_Node_Type;
+
+typedef enum
+{
+   E_INFO_COMPARER_EQUAL,
+   E_INFO_COMPARER_LESS,
+   E_INFO_COMPARER_GREATER,
+   E_INFO_COMPARER_LESS_EQ,
+   E_INFO_COMPARER_GREATER_EQ,
+   E_INFO_COMPARER_NOT_EQ
+} E_Info_Comparer;
+
+typedef enum
+{
+   E_INFO_DATA_TYPE_INTEGER,
+   E_INFO_DATA_TYPE_STRING
+} E_Info_Data_Type;
+
+typedef enum
+{
+   E_INFO_RESULT_UNKNOWN,
+   E_INFO_RESULT_TRUE,
+   E_INFO_RESULT_FALSE
+} E_Info_Result_Type;
+
+struct _E_Info_Rule_Node
+{
+   E_Info_Node_Type node_type;
+
+   char             variable_name[STRING_MAX];
+   E_Info_Comparer  comparer;
+   E_Info_Data_Type value_type;
+
+   union
+   {
+      char string[STRING_MAX];
+      int  integer;
+   } value;
+
+   E_Info_Result_Type result;
+};
+
+typedef enum
+{
+   E_INFO_POLICY_TYPE_UNDEFINED,
+   E_INFO_POLICY_TYPE_ALLOW,
+   E_INFO_POLICY_TYPE_DENY
+} E_Info_Policy_Type;
+
+struct _E_Info_Rule
+{
+   E_Info_Policy_Type policy;
+   E_Info_Tree       *tree;
+};
+
+struct _E_Info_Rule_Checker
+{
+   E_Info_Rule rules[MAX_RULE];
+   int         count;
+};
+
+typedef enum
+{
+   E_INFO_PROTOCOL_TYPE_REQUEST,
+   E_INFO_PROTOCOL_TYPE_EVENT,
+} E_Info_Protocol_Type;
+
+struct _E_Info_Protocol_Log
+{
+   E_Info_Protocol_Type type;
+   int                  client_pid;
+   int                  target_id;
+   char                 name[PATH_MAX + 1];
+   char                 cmd[PATH_MAX + 1];
+};
+
+EINTERN void      e_info_protocol_init();
+EINTERN void      e_info_protocol_shutdown();
+
+EINTERN Eina_Bool e_info_protocol_rule_set(const int argc, const char **argv, char *reply, int *len);
+EINTERN Eina_Bool e_info_protocol_rule_validate(E_Info_Protocol_Log *log);
+#endif

diff --git a/src/bin/e_info_server.c b/src/bin/e_info_server.c
index 73b2eeca3ff01a464c6e17d3cbfba0478208205e..a66c87e5590ed3a212bd82f902f6a029d7d21929 100644 (file)
--- a/src/bin/e_info_server.c
+++ b/src/bin/e_info_server.c
@@ -3,7 +3,7 @@
 #include "e_utils_intern.h"
 #include "e_policy_wl.h"
 #include "e_comp_object.h"
-#include "e_info_protocol.h"
+#include "e_info_protocol_intern.h"
 #include "e_info_server_input.h"
 #include "services/e_service_quickpanel.h"
 #include "services/e_service_kvm.h"