]> git.proxmox.com Git - mirror_lxcfs.git/commitdiff
avoid strlen in must_strcat_pid
authorWolfgang Bumiller <w.bumiller@proxmox.com>
Thu, 7 Jan 2016 11:59:52 +0000 (12:59 +0100)
committerSerge Hallyn <serge.hallyn@ubuntu.com>
Thu, 7 Jan 2016 19:13:27 +0000 (11:13 -0800)
sprintf() already returns the length

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
lxcfs.c

diff --git a/lxcfs.c b/lxcfs.c
index 767a34404126214fc3c5f6b6b88ba2c9fce251d3..860500030e29e51d2ca576d2ba61c3352416d4eb 100644 (file)
--- a/lxcfs.c
+++ b/lxcfs.c
@@ -77,7 +77,7 @@ static void must_strcat_pid(char **src, size_t *sz, size_t *asz, pid_t pid)
        char *d = *src;
        char tmp[30];
 
-       sprintf(tmp, "%d\n", (int)pid);
+       int tmplen = sprintf(tmp, "%d\n", (int)pid);
 
        if (!d) {
                do {
@@ -85,15 +85,15 @@ static void must_strcat_pid(char **src, size_t *sz, size_t *asz, pid_t pid)
                } while (!d);
                *src = d;
                *asz = BUF_RESERVE_SIZE;
-       } else if (strlen(tmp) + *sz + 1 >= *asz) {
+       } else if (tmplen + *sz + 1 >= *asz) {
                do {
                        d = realloc(d, *asz + BUF_RESERVE_SIZE);
                } while (!d);
                *src = d;
                *asz += BUF_RESERVE_SIZE;
        }
-       memcpy(d+*sz, tmp, strlen(tmp));
-       *sz += strlen(tmp);
+       memcpy(d+*sz, tmp, tmplen);
+       *sz += tmplen;
        d[*sz] = '\0';
 }