X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fvserver.c;h=6f9d46bfe12c33691342f04e7113615ea40d7087;hp=96af6fc8bf2291622934200e78a66e49d9840076;hb=da11ce02eb202b3e01d3e2d1b40f248a84430973;hpb=2412d3ca76f7ac24e67543720c1d385188da0ce3 diff --git a/src/vserver.c b/src/vserver.c index 96af6fc8..6f9d46bf 100644 --- a/src/vserver.c +++ b/src/vserver.c @@ -49,7 +49,7 @@ static int vserver_init(void) { * What's the right thing to do, if there is no getpagesize ()? */ pagesize = getpagesize(); - return (0); + return 0; } /* static void vserver_init(void) */ static void traffic_submit(const char *plugin_instance, @@ -114,8 +114,8 @@ static derive_t vserver_get_sock_bytes(const char *s) { status = parse_value(s, &v, DS_TYPE_DERIVE); if (status != 0) - return (-1); - return (v.derive); + return -1; + return v.derive; } static int vserver_read(void) { @@ -127,7 +127,7 @@ static int vserver_read(void) { char errbuf[1024]; ERROR("vserver plugin: fopen (%s): %s", PROCDIR, sstrerror(errno, errbuf, sizeof(errbuf))); - return (-1); + return -1; } while (42) { @@ -154,13 +154,13 @@ static int vserver_read(void) { ERROR("vserver plugin: failed to read directory %s: %s", PROCDIR, sstrerror(errno, errbuf, sizeof(errbuf))); closedir(proc); - return (-1); + return -1; } if (dent->d_name[0] == '.') continue; - len = ssnprintf(file, sizeof(file), PROCDIR "/%s", dent->d_name); + len = snprintf(file, sizeof(file), PROCDIR "/%s", dent->d_name); if ((len < 0) || (len >= BUFSIZE)) continue; @@ -176,7 +176,7 @@ static int vserver_read(void) { continue; /* socket message accounting */ - len = ssnprintf(file, sizeof(file), PROCDIR "/%s/cacct", dent->d_name); + len = snprintf(file, sizeof(file), PROCDIR "/%s/cacct", dent->d_name); if ((len < 0) || ((size_t)len >= sizeof(file))) continue; @@ -220,7 +220,7 @@ static int vserver_read(void) { } /* thread information and load */ - len = ssnprintf(file, sizeof(file), PROCDIR "/%s/cvirt", dent->d_name); + len = snprintf(file, sizeof(file), PROCDIR "/%s/cvirt", dent->d_name); if ((len < 0) || ((size_t)len >= sizeof(file))) continue; @@ -266,7 +266,7 @@ static int vserver_read(void) { } /* processes and memory usage */ - len = ssnprintf(file, sizeof(file), PROCDIR "/%s/limit", dent->d_name); + len = snprintf(file, sizeof(file), PROCDIR "/%s/limit", dent->d_name); if ((len < 0) || ((size_t)len >= sizeof(file))) continue; @@ -314,7 +314,7 @@ static int vserver_read(void) { closedir(proc); - return (0); + return 0; } /* int vserver_read */ void module_register(void) {