X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnfs.c;h=481aa79e27c7e38420f9986a8eb95816b4ad942f;hb=7c9d772c992647fcba64a96800c146eb9f1647f8;hp=f50a3524a63ad190ebc0d72eed6aac764121f56a;hpb=ca6d2f62d82ba4d07d6f266e3abbe1c0230d2f5a;p=collectd.git diff --git a/src/nfs.c b/src/nfs.c index f50a3524..481aa79e 100644 --- a/src/nfs.c +++ b/src/nfs.c @@ -33,9 +33,9 @@ static const char *config_keys[] = {"ReportV2", "ReportV3", "ReportV4"}; static int config_keys_num = STATIC_ARRAY_SIZE(config_keys); -static _Bool report_v2 = 1; -static _Bool report_v3 = 1; -static _Bool report_v4 = 1; +static bool report_v2 = true; +static bool report_v3 = true; +static bool report_v4 = true; /* see /proc/net/rpc/nfs @@ -409,7 +409,7 @@ static int nfs_submit_fields_safe(int nfs_version, const char *instance, static int nfs_submit_nfs4_server(const char *instance, char **fields, size_t fields_num) { - static int suppress_warning = 0; + static int suppress_warning; size_t proc4x_names_num; switch (fields_num) { @@ -451,7 +451,7 @@ static int nfs_submit_nfs4_client(const char *instance, char **fields, size_t fields_num) { size_t proc40_names_num, proc4x_names_num; - static int suppress_warning = 0; + static int suppress_warning; switch (fields_num) { case 34: @@ -519,7 +519,8 @@ static int nfs_submit_nfs4_client(const char *instance, char **fields, static void nfs_read_linux(FILE *fh, const char *inst) { char buffer[1024]; - char *fields[64]; + // The stats line is prefixed with type and number of fields, thus plus 2 + char *fields[MAX(NFS4_SERVER_MAX_PROC, NFS4_CLIENT_MAX_PROC) + 2]; int fields_num = 0; if (fh == NULL)