X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fzfs_arc.c;h=be93b9dbeb2a7b291e08f355b32aaae005c0bd41;hb=950876683f3b214072e9295cee21999ed726cd83;hp=d18a93f76136fda29a5ab2e395921e14a59990f8;hpb=6378ec288f34ff250b2971a1452338a2b34c240a;p=collectd.git diff --git a/src/zfs_arc.c b/src/zfs_arc.c index d18a93f7..be93b9db 100644 --- a/src/zfs_arc.c +++ b/src/zfs_arc.c @@ -127,7 +127,7 @@ static long long get_zfs_value(kstat_t *dummy __attribute__((unused)), size_t valuelen = sizeof(value); int rv; - snprintf(buffer, sizeof(buffer), "%s%s", zfs_arcstat, name); + ssnprintf(buffer, sizeof(buffer), "%s%s", zfs_arcstat, name); rv = sysctlbyname(buffer, (void *)&value, &valuelen, /* new value = */ NULL, /* new length = */ (size_t)0); if (rv == 0) @@ -231,23 +231,6 @@ static int za_read(void) { return -1; } - // Ignore the first two lines because they contain information about - // the rest of the file. - // See kstat_seq_show_headers module/spl/spl-kstat.c of the spl kernel - // module. - if (fgets(buffer, sizeof(buffer), fh) == NULL) { - ERROR("zfs_arc plugin: \"%s\" does not contain a single line.", - ZOL_ARCSTATS_FILE); - fclose(fh); - return (-1); - } - if (fgets(buffer, sizeof(buffer), fh) == NULL) { - ERROR("zfs_arc plugin: \"%s\" does not contain at least two lines.", - ZOL_ARCSTATS_FILE); - fclose(fh); - return (-1); - } - while (fgets(buffer, sizeof(buffer), fh) != NULL) { char *fields[3]; value_t v;