confile: lxc_listconfigs -> lxc_list_config_items

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index 91e90cac7b2ac642f08e8303236d5d1fe6d12267..6f863e5dacaf0accfec2a83ef46a988fc55b1e72 100644 (file)
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -366,27 +366,6 @@ extern struct lxc_config_t *lxc_getconfig(const char *key)
        return NULL;
 }
 
-int lxc_listconfigs(char *retv, int inlen)
-{
-       size_t i;
-       int len;
-       int fulllen = 0;
-
-       if (!retv)
-               inlen = 0;
-       else
-               memset(retv, 0, inlen);
-
-       for (i = 0; i < config_size; i++) {
-               char *s = config[i].name;
-               if (s[strlen(s) - 1] == '.')
-                       continue;
-               strprint(retv, inlen, "%s\n", s);
-       }
-
-       return fulllen;
-}
-
 static int set_config_net(const char *key, const char *value,
                          struct lxc_conf *lxc_conf, void *data)
 {
@@ -4506,3 +4485,24 @@ static int get_config_net_ipv6_address(const char *key, char *retv, int inlen,
 
        return fulllen;
 }
+
+int lxc_list_config_items(char *retv, int inlen)
+{
+       size_t i;
+       int len;
+       int fulllen = 0;
+
+       if (!retv)
+               inlen = 0;
+       else
+               memset(retv, 0, inlen);
+
+       for (i = 0; i < config_size; i++) {
+               char *s = config[i].name;
+               if (s[strlen(s) - 1] == '.')
+                       continue;
+               strprint(retv, inlen, "%s\n", s);
+       }
+
+       return fulllen;
+}

diff --git a/src/lxc/confile.h b/src/lxc/confile.h
index 191676ffb3b084f27d356afb2ce62a14a0d4f85c..ef034394548bc6feb6d1f8f3e80899b2fd60dd0e 100644 (file)
--- a/src/lxc/confile.h
+++ b/src/lxc/confile.h
@@ -55,7 +55,7 @@ extern struct lxc_config_t *lxc_getconfig(const char *key);
  */
 extern int lxc_list_net(struct lxc_conf *c, const char *key, char *retv,
                        int inlen);
-extern int lxc_listconfigs(char *retv, int inlen);
+extern int lxc_list_config_items(char *retv, int inlen);
 extern int lxc_config_read(const char *file, struct lxc_conf *conf, bool from_include);
 extern int append_unexp_config_line(const char *line, struct lxc_conf *conf);
 

diff --git a/src/lxc/confile_utils.c b/src/lxc/confile_utils.c
index 332b98ae895ee9b08242d69f450e570149ebc55d..fa3f645985518caf51079dd232911c4ec8b8b89b 100644 (file)
--- a/src/lxc/confile_utils.c
+++ b/src/lxc/confile_utils.c
@@ -680,4 +680,3 @@ bool parse_limit_value(const char **value, unsigned long *res)
 
        return true;
 }
-

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 025ac4e17e286a86406def6be12531751fab477b..a02e93e77940a4abaef88f41613ce231fcc9eae8 100644 (file)
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -2249,7 +2249,7 @@ WRAP_API_1(char *, lxcapi_get_running_config_item, const char *)
 static int do_lxcapi_get_keys(struct lxc_container *c, const char *key, char *retv, int inlen)
 {
        if (!key)
-               return lxc_listconfigs(retv, inlen);
+               return lxc_list_config_items(retv, inlen);
        /*
         * Support 'lxc.net.<idx>', i.e. 'lxc.net.0'
         * This is an intelligent result to show which keys are valid given

diff --git a/src/tests/config_jump_table.c b/src/tests/config_jump_table.c
index f2f70dd33228851b5c3e571b967700e770553c54..1fb244d42e2598a0c22a6b0dcbf607a3548335b3 100644 (file)
--- a/src/tests/config_jump_table.c
+++ b/src/tests/config_jump_table.c
@@ -38,7 +38,7 @@ int main(int argc, char *argv[])
        int fulllen = 0, inlen = 0, ret = EXIT_FAILURE;
        char *key, *keys, *saveptr = NULL;
 
-       fulllen = lxc_listconfigs(NULL, inlen);
+       fulllen = lxc_list_config_items(NULL, inlen);
 
        keys = malloc(sizeof(char) * fulllen + 1);
        if (!keys) {
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
                exit(ret);
        }
 
-       if (lxc_listconfigs(keys, fulllen) != fulllen) {
+       if (lxc_list_config_items(keys, fulllen) != fulllen) {
                lxc_error("%s\n", "failed to retrieve configuration keys");
                goto on_error;
        }