X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fnfs.c;h=ee2d93b2f6e43f6e843c7c245032d124055433c9;hb=4103105fb43cd72294f165b2541540b3a8a99532;hp=be823720b489ec3ddd8f1f75d7976b28469fd5ab;hpb=213eb227d7737bfbd899474033f94342c61dcb8c;p=collectd.git

diff --git a/src/nfs.c b/src/nfs.c
index be823720..ee2d93b2 100644
--- a/src/nfs.c
+++ b/src/nfs.c
@@ -23,6 +23,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
@@ -221,7 +222,7 @@ static size_t nfs4_server40_procedures_names_num = STATIC_ARRAY_SIZE (nfs4_serve
 static const char *nfs4_server41_procedures_names[] =
 {
 	"backchannel_ctl",
-	"bind_conn_to_session",	
+	"bind_conn_to_session",
 	"exchange_id",
 	"create_session",
 	"destroy_session",
@@ -404,7 +405,7 @@ static void nfs_procedures_submit (const char *plugin_instance,
 } /* void nfs_procedures_submit */
 
 #if KERNEL_LINUX
-static void nfs_submit_fields (int nfs_version, const char *instance, 
+static void nfs_submit_fields (int nfs_version, const char *instance,
 		char **fields, size_t fields_num, const char **proc_names)
 {
 	char plugin_instance[DATA_MAX_NAME_LEN];
@@ -434,19 +435,19 @@ static int nfs_submit_fields_safe (int nfs_version, const char *instance,
 		return (EINVAL);
 	}
 
-	nfs_submit_fields (nfs_version, instance, fields, fields_num, 
+	nfs_submit_fields (nfs_version, instance, fields, fields_num,
 			proc_names);
 
 	return (0);
 }
 
-static int nfs_submit_nfs4_server (const char *instance, char **fields, 
+static int nfs_submit_nfs4_server (const char *instance, char **fields,
 		size_t fields_num)
 {
 	static int suppress_warning = 0;
 
 	if (fields_num != NFS4_SERVER40_NUM_PROC &&
-		fields_num != NFS4_SERVER41_NUM_PROC) 
+		fields_num != NFS4_SERVER41_NUM_PROC)
 	{
 		if (!suppress_warning)
 		{
@@ -466,7 +467,7 @@ static int nfs_submit_nfs4_server (const char *instance, char **fields,
 		}
 	}
 
-        nfs_submit_fields (4, instance, fields, 
+        nfs_submit_fields (4, instance, fields,
 			nfs4_server40_procedures_names_num,
 			nfs4_server40_procedures_names);
 
@@ -474,15 +475,15 @@ static int nfs_submit_nfs4_server (const char *instance, char **fields,
 	{
 		fields += nfs4_server40_procedures_names_num;
 
-	        nfs_submit_fields (4, instance, fields, 
-				nfs4_server41_procedures_names_num, 
+	        nfs_submit_fields (4, instance, fields,
+				nfs4_server41_procedures_names_num,
 				nfs4_server41_procedures_names);
 	}
 
 	return (0);
 }
 
-static int nfs_submit_nfs4_client (const char *instance, char **fields, 
+static int nfs_submit_nfs4_client (const char *instance, char **fields,
 		size_t fields_num)
 {
 	size_t proc40_names_num, proc41_names_num;
@@ -554,7 +555,7 @@ static int nfs_submit_nfs4_client (const char *instance, char **fields,
 	return (0);
 }
 
-static void nfs_read_linux (FILE *fh, char *inst)
+static void nfs_read_linux (FILE *fh, const char *inst)
 {
 	char buffer[1024];
 
@@ -589,21 +590,21 @@ static void nfs_read_linux (FILE *fh, char *inst)
 		else if (strcmp (fields[0], "proc4ops") == 0)
 		{
 			if (inst[0] == 's')
-				nfs_submit_nfs4_server (inst, fields + 2, 
+				nfs_submit_nfs4_server (inst, fields + 2,
 						(size_t) (fields_num - 2));
 		}
 		else if (strcmp (fields[0], "proc4") == 0)
 		{
 			if (inst[0] == 'c')
 				nfs_submit_nfs4_client (inst, fields + 2,
-						(size_t) (fields_num - 2));			
+						(size_t) (fields_num - 2));
 		}
 	} /* while (fgets) */
 } /* void nfs_read_linux */
 #endif /* KERNEL_LINUX */
 
 #if HAVE_LIBKSTAT
-static int nfs_read_kstat (kstat_t *ksp, int nfs_version, char *inst,
+static int nfs_read_kstat (kstat_t *ksp, int nfs_version, const char *inst,
 		char const **proc_names, size_t proc_names_num)
 {
 	char plugin_instance[DATA_MAX_NAME_LEN];