X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fvserver.c;h=a730593654bb79c3c0d6b58d69aef812ef2cb838;hb=448627953cde2f7b3b138f53f4f2c62f0d48b726;hp=bd2e867384870ef7212af60d88d678b21bdd3db5;hpb=22651d8d4dc49e24bbac2cd34e0642dcf3639c97;p=collectd.git diff --git a/src/vserver.c b/src/vserver.c index bd2e8673..a7305936 100644 --- a/src/vserver.c +++ b/src/vserver.c @@ -27,6 +27,7 @@ **/ #include "collectd.h" + #include "common.h" #include "plugin.h" @@ -146,7 +147,7 @@ static int vserver_read (void) if (proc == NULL) { char errbuf[1024]; - ERROR ("vserver plugin: fopen (%s): %s", PROCDIR, + ERROR ("vserver plugin: fopen (%s): %s", PROCDIR, sstrerror (errno, errbuf, sizeof (errbuf))); return (-1); } @@ -185,7 +186,7 @@ static int vserver_read (void) len = ssnprintf (file, sizeof (file), PROCDIR "/%s", dent->d_name); if ((len < 0) || (len >= BUFSIZE)) continue; - + status = stat (file, &statbuf); if (status != 0) { @@ -194,7 +195,7 @@ static int vserver_read (void) file, sstrerror (errno, errbuf, sizeof (errbuf))); continue; } - + if (!S_ISDIR (statbuf.st_mode)) continue; @@ -215,7 +216,7 @@ static int vserver_read (void) { derive_t rx; derive_t tx; - char *type_instance; + const char *type_instance; if (strsplit (buffer, cols, 4) < 4) continue; @@ -265,7 +266,7 @@ static int vserver_read (void) if (2 == n) { - char *type_instance; + const char *type_instance; gauge_t value; if (0 == strcmp (cols[0], "nr_threads:")) @@ -314,8 +315,8 @@ static int vserver_read (void) while ((fh != NULL) && (NULL != fgets (buffer, BUFSIZE, fh))) { - char *type = "vs_memory"; - char *type_instance; + const char *type = "vs_memory"; + const char *type_instance; gauge_t value; if (strsplit (buffer, cols, 2) < 2)