Merge pull request #1650 from 0x0916/2017-06-27/refactor-confile-code

refactor confile code

Merge pull request #1650 from 0x0916/2017-06-27/refactor-confile-code
3129a46f · Christian Brauner · GitHub · c949f5cc · 71e287ca · 3129a46f
Commit 3129a46f authored Jun 27, 2017 by Christian Brauner Committed by GitHub Jun 27, 2017
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 21 deletions

confile.c src/lxc/confile.c +0 -0

confile_legacy.h src/lxc/confile_legacy.h +11 -21

No files found.
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
--- a/src/lxc/confile_legacy.h
+++ b/src/lxc/confile_legacy.h
@@ -68,33 +68,23 @@ extern int get_config_network_legacy_item(const char *, char *, int,
 extern int clr_config_network_legacy_item(const char *, struct lxc_conf *,
 					  void *);
-extern int set_config_network_legacy(const char *, const char *,
-				     struct lxc_conf *, void *);
-extern int get_config_network_legacy(const char *, char *, int,
-				     struct lxc_conf *, void *);
-extern int clr_config_network_legacy(const char *, struct lxc_conf *, void *);
 extern int lxc_list_nicconfigs_legacy(struct lxc_conf *c, const char *key,
 				      char *retv, int inlen);
 extern int lxc_listconfigs(char *retv, int inlen);
 extern bool network_new_hwaddrs(struct lxc_conf *conf);
-extern int set_config_lsm_aa_profile(const char *, const char *,
+#define lxc_config_legacy_define(name)					\
-				     struct lxc_conf *, void *);
+	extern int set_config_##name(const char *, const char *,	\
-extern int get_config_lsm_aa_profile(const char *, char *, int,
+			struct lxc_conf *, void *);			\
-				     struct lxc_conf *, void *);
+	extern int get_config_##name(const char *, char *, int,		\
-extern int clr_config_lsm_aa_profile(const char *, struct lxc_conf *, void *);
+			struct lxc_conf *, void *);			\
+	extern int clr_config_##name(const char *, struct lxc_conf *,	\
+			void *);
-extern int set_config_lsm_aa_incomplete(const char *, const char *,
+lxc_config_legacy_define(network_legacy);
- 				struct lxc_conf *, void *);
+lxc_config_legacy_define(lsm_aa_profile);
-extern int get_config_lsm_aa_incomplete(const char *, char *, int,
+lxc_config_legacy_define(lsm_aa_incomplete);
- 				struct lxc_conf *, void *);
+lxc_config_legacy_define(lsm_se_context);
-extern int clr_config_lsm_aa_incomplete(const char *, struct lxc_conf *,
-					void *);
-extern int set_config_lsm_se_context(const char *, const char *,
-         		     struct lxc_conf *, void *);
-extern int get_config_lsm_se_context(const char *, char *, int,
-         		     struct lxc_conf *, void *);
-extern int clr_config_lsm_se_context(const char *, struct lxc_conf *, void *);
 #endif /* __LXC_CONFILE_LEGACY_H */