use same resolve_field_table_s struct for all type

src/include/66/resolve.h

@@ -27,8 +27,6 @@
 
 #include <66/ssexec.h>
 #include <66/parser.h>
-#include <66/tree.h>
-#include <66/service.h>
 
 
 #define SS_RESOLVE "/.resolve"
@@ -41,6 +39,10 @@
 #define SS_SIMPLE 0
 #define SS_DOUBLE 1
 
+#define DATA_SERVICE 0
+#define DATA_TREE 1
+#define DATA_TREE_MASTER 2
+
 typedef struct resolve_wrapper_s resolve_wrapper_t, *resolve_wrapper_t_ref ;
 struct resolve_wrapper_s
 {
@@ -55,6 +57,13 @@ struct resolve_wrapper_s
     else if (wres->type == DATA_TREE) sawres = (&((resolve_tree_t *)wres->obj)->sa) ; \
     else if (wres->type == DATA_TREE_MASTER) sawres = (&((resolve_tree_master_t *)wres->obj)->sa) ;
 #endif
+
+typedef struct resolve_field_table_s resolve_field_table_t, *resolve_field_table_t_ref ;
+struct resolve_field_table_s
+{
+    char *field ;
+} ;
+
 /**
  *
  * General API

src/include/66/service.h

@@ -24,6 +24,7 @@
 
 #include <66/parser.h>
 #include <66/ssexec.h>
+#include <66/resolve.h>
 
 
 /** Graph struct */
@@ -52,9 +53,6 @@ enum visit_e
     SS_BLACK
 } ;
 
-
-#define DATA_SERVICE 0
-
 typedef struct resolve_service_s resolve_service_t, *resolve_service_t_ref ;
 struct resolve_service_s
 {
@@ -137,13 +135,7 @@ enum resolve_service_enum_e
     SERVICE_ENUM_ENDOFKEY
 } ;
 
-typedef struct resolve_service_field_table_s resolve_service_field_table_t, *resolve_service_field_table_t_ref ;
-struct resolve_service_field_table_s
-{
-    char *field ;
-} ;
-
-extern resolve_service_field_table_t resolve_service_field_table[] ;
+extern resolve_field_table_t resolve_service_field_table[] ;
 
 extern int service_isenabled(char const *sv) ;
 extern int service_isenabledat(stralloc *tree, char const *sv) ;

src/include/66/tree.h

@@ -16,6 +16,7 @@
 #define SS_TREE_H
 
 #include <sys/types.h>
+#include <stdint.h>
 
 #include <skalibs/stralloc.h>
 #include <skalibs/cdb.h>
@@ -24,9 +25,6 @@
 #include <66/ssexec.h>
 #include <66/resolve.h>
 
-
-#define DATA_TREE 1
-#define DATA_TREE_MASTER 2
 #define TREE_GROUPS_BOOT "boot"
 #define TREE_GROUPS_BOOT_LEN (sizeof TREE_GROUPS_BOOT - 1)
 #define TREE_GROUPS_ADM "admin"
@@ -77,14 +75,6 @@ enum resolve_tree_enum_e
     TREE_ENUM_ENDOFKEY
 } ;
 
-typedef struct resolve_tree_field_table_s resolve_tree_field_table_t, *resolve_tree_field_table_t_ref ;
-struct resolve_tree_field_table_s
-{
-    char *field ;
-} ;
-
-extern resolve_tree_field_table_t resolve_tree_field_table[] ;
-
 typedef struct resolve_tree_master_s resolve_tree_master_t, *resolve_tree_master_t_ref ;
 struct resolve_tree_master_s
 {
@@ -112,7 +102,8 @@ enum resolve_tree_master_enum_e
     TREE_ENUM_MASTER_ENDOFKEY
 } ;
 
-extern resolve_tree_field_table_t resolve_tree_master_field_table[] ;
+extern resolve_field_table_t resolve_tree_field_table[] ;
+extern resolve_field_table_t resolve_tree_master_field_table[] ;
 
 typedef struct tree_seed_s tree_seed_t, tree_seed_t_ref ;
 struct tree_seed_s

src/lib66/service.c

@@ -433,7 +433,7 @@ int service_cmp_basedir(char const *dir)
  *
  * */
 
-resolve_service_field_table_t resolve_service_field_table[] = {
+resolve_field_table_t resolve_service_field_table[] = {
 
     [SERVICE_ENUM_NAME] = { .field = "name" },
     [SERVICE_ENUM_DESCRIPTION] = { .field = "description" },

src/lib66/tree_resolve.c

@@ -31,7 +31,7 @@
 #include <66/graph.h>
 
 
-resolve_tree_field_table_t resolve_tree_field_table[] = {
+resolve_field_table_t resolve_tree_field_table[] = {
 
     [TREE_ENUM_NAME] = { .field = "name" },
     [TREE_ENUM_DEPENDS] = { .field = "depends" },
@@ -49,7 +49,7 @@ resolve_tree_field_table_t resolve_tree_field_table[] = {
     [TREE_ENUM_ENDOFKEY] = { .field = 0 }
 } ;
 
-resolve_tree_field_table_t resolve_tree_master_field_table[] = {
+resolve_field_table_t resolve_tree_master_field_table[] = {
 
     [TREE_ENUM_MASTER_NAME] = { .field = "name" },
     [TREE_ENUM_MASTER_ALLOW] = { .field = "allow" },