confile_utils: fix return value & cleanups

[mirror_lxc.git] / src / lxc / confile_utils.h

diff --git a/src/lxc/confile_utils.h b/src/lxc/confile_utils.h
index 222de3de9fb064cd54d9e27dda687d321183879c..b58ce47b2dd2a71754efe3228d767448d3141223 100644 (file)
--- a/src/lxc/confile_utils.h
+++ b/src/lxc/confile_utils.h
@@ -41,21 +41,24 @@
 #define MACVLAN_MODE_PASSTHRU 8
 #endif
 
-#define strprint(str, inlen, ...)                                              \
-       do {                                                                   \
-               len = snprintf(str, inlen, ##__VA_ARGS__);                     \
-               if (len < 0) {                                                 \
-                       SYSERROR("failed to create string");                   \
-                       return -1;                                             \
-               };                                                             \
-               fulllen += len;                                                \
-               if (inlen > 0) {                                               \
-                       if (str)                                               \
-                               str += len;                                    \
-                       inlen -= len;                                          \
-                       if (inlen < 0)                                         \
-                               inlen = 0;                                     \
-               }                                                              \
+#define strprint(str, inlen, ...)                                       \
+       do {                                                            \
+               if (str)                                                \
+                       len = snprintf(str, inlen, ##__VA_ARGS__);      \
+               else                                                    \
+                       len = snprintf((char *){""}, 0, ##__VA_ARGS__); \
+               if (len < 0) {                                          \
+                       SYSERROR("failed to create string");            \
+                       return -1;                                      \
+               };                                                      \
+               fulllen += len;                                         \
+               if (inlen > 0) {                                        \
+                       if (str)                                        \
+                               str += len;                             \
+                       inlen -= len;                                   \
+                       if (inlen < 0)                                  \
+                               inlen = 0;                              \
+               }                                                       \
        } while (0);
 
 extern int parse_idmaps(const char *idmap, char *type, unsigned long *nsid,
@@ -77,12 +80,18 @@ extern int set_config_string_item_max(char **conf_item, const char *value,
                                      size_t max);
 extern int set_config_path_item(char **conf_item, const char *value);
 extern int config_ip_prefix(struct in_addr *addr);
-extern int network_ifname(char **valuep, const char *value);
-extern int rand_complete_hwaddr(char *hwaddr);
+extern int network_ifname(char *valuep, const char *value, size_t size);
+extern void rand_complete_hwaddr(char *hwaddr);
 extern bool lxc_config_net_hwaddr(const char *line);
 extern void update_hwaddr(const char *line);
 extern bool new_hwaddr(char *hwaddr);
 extern int lxc_get_conf_str(char *retv, int inlen, const char *value);
 extern int lxc_get_conf_int(struct lxc_conf *c, char *retv, int inlen, int v);
-extern bool parse_limit_value(const char **value, unsigned long *res);
+extern int lxc_get_conf_size_t(struct lxc_conf *c, char *retv, int inlen, size_t v);
+extern int lxc_get_conf_uint64(struct lxc_conf *c, char *retv, int inlen, uint64_t v);
+extern bool parse_limit_value(const char **value, rlim_t *res);
+extern int lxc_inherit_namespace(const char *lxcname_or_pid,
+                                const char *lxcpath, const char *namespace);
+extern int sig_parse(const char *signame);
+
 #endif /* __LXC_CONFILE_UTILS_H */