proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-07 15:29:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

confile: s/LXC_NUMSTRLEN64/INTTYPE_TO_STRLEN()/

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2018-08-25 12:09:41 +02:00
parent c19ad94b0a
commit c77aee6475
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lxc/confile.c
View File

@ -3236,19 +3236,19 @@ static int get_config_idmaps(const char *key, char *retv, int inlen,
* + * +
* sizeof(" ") * sizeof(" ")
* + * +
* sizeof(uint64_t) * sizeof(uint32_t)
* + * +
* sizeof(" ") * sizeof(" ")
* + * +
* sizeof(uint64_t) * sizeof(uint32_t)
* + * +
* sizeof(" ") * sizeof(" ")
* + * +
* sizeof(uint64_t) * sizeof(uint32_t)
* + * +
* \0 * \0
*/ */
#define __LXC_IDMAP_STR_BUF (3 * LXC_NUMSTRLEN64 + 3 + 1 + 1) #define __LXC_IDMAP_STR_BUF (3 * INTTYPE_TO_STRLEN(uint32_t) + 3 + 1 + 1)
char buf[__LXC_IDMAP_STR_BUF]; char buf[__LXC_IDMAP_STR_BUF];
if (!retv) if (!retv)
@ -3257,8 +3257,7 @@ static int get_config_idmaps(const char *key, char *retv, int inlen,
memset(retv, 0, inlen); memset(retv, 0, inlen);
listlen = lxc_list_len(&c->id_map); listlen = lxc_list_len(&c->id_map);
lxc_list_for_each(it, &c->id_map) lxc_list_for_each(it, &c->id_map) {
{
struct id_map *map = it->elem; struct id_map *map = it->elem;
ret = snprintf(buf, __LXC_IDMAP_STR_BUF, "%c %lu %lu %lu", ret = snprintf(buf, __LXC_IDMAP_STR_BUF, "%c %lu %lu %lu",
(map->idtype == ID_TYPE_UID) ? 'u' : 'g', (map->idtype == ID_TYPE_UID) ? 'u' : 'g',
@ -3706,9 +3705,8 @@ static int get_config_prlimit(const char *key, char *retv, int inlen,
return -1; return -1;
lxc_list_for_each(it, &c->limits) { lxc_list_for_each(it, &c->limits) {
char buf[LXC_NUMSTRLEN64 * 2 + 2]; /* 2 colon separated 64 bit /* 2 colon separated 64 bit integers or the word 'unlimited' */
integers or the word char buf[INTTYPE_TO_STRLEN(uint64_t) * 2 + 2];
'unlimited' */
int partlen; int partlen;
struct lxc_limit *lim = it->elem; struct lxc_limit *lim = it->elem;