X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnfs.c;h=8d5b6309a885b8591f5d472277dc1146b266e3b8;hb=61a4ed99b1a5b6d371bb745933d0efc5dff9505c;hp=b556307ecad933cd0992051240870bc56f0dc51c;hpb=1159cb5d383c55a80a0db100b8f7aadcf44740a5;p=collectd.git diff --git a/src/nfs.c b/src/nfs.c index b556307e..8d5b6309 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 = 1; +static bool report_v3 = 1; +static bool report_v4 = 1; /* see /proc/net/rpc/nfs @@ -397,7 +397,7 @@ static int nfs_submit_fields_safe(int nfs_version, const char *instance, size_t proc_names_num) { if (fields_num != proc_names_num) { WARNING("nfs plugin: Wrong number of fields for " - "NFSv%i %s statistics. Expected %zu, got %zu.", + "NFSv%i %s statistics. Expected %" PRIsz ", got %" PRIsz ".", nfs_version, instance, proc_names_num, fields_num); return EINVAL; } @@ -421,7 +421,7 @@ static int nfs_submit_nfs4_server(const char *instance, char **fields, default: if (!suppress_warning) { WARNING("nfs plugin: Unexpected number of fields for " - "NFSv4 %s statistics: %zu. ", + "NFSv4 %s statistics: %" PRIsz ". ", instance, fields_num); } @@ -486,9 +486,8 @@ static int nfs_submit_nfs4_client(const char *instance, char **fields, break; default: if (!suppress_warning) { - WARNING("nfs plugin: Unexpected number of " - "fields for NFSv4 %s " - "statistics: %zu. ", + WARNING("nfs plugin: Unexpected number of fields for NFSv4 %s " + "statistics: %" PRIsz ". ", instance, fields_num); }