X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fvserver.c;h=1615ca04a1fc1bdbb2c22650e4397f49f80ee552;hb=refs%2Fheads%2Fcollectd-4.9;hp=8747d9ba90b01cf26b4cf07cf9b97e5f4827e922;hpb=d54dfab9b049de396e6a38d690d5f18917e093ea;p=collectd.git

diff --git a/src/vserver.c b/src/vserver.c
index 8747d9ba..1615ca04 100644
--- a/src/vserver.c
+++ b/src/vserver.c
@@ -1,6 +1,7 @@
 /**
  * collectd - src/vserver.c
  * Copyright (C) 2006,2007  Sebastian Harl
+ * Copyright (C) 2007,2008  Florian octo Forster
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -17,6 +18,7 @@
  *
  * Authors:
  *   Sebastian Harl <sh at tokkee.org>
+ *   Florian octo Forster <octo at verplant.org>
  **/
 
 #include "collectd.h"
@@ -139,7 +141,7 @@ static int vserver_read (void)
 
 	while (42)
 	{
-		size_t len;
+		int len;
 		char file[BUFSIZE];
 
 		FILE *fh;
@@ -168,7 +170,7 @@ static int vserver_read (void)
 		if (dent->d_name[0] == '.')
 			continue;
 
-		len = snprintf (file, sizeof (file), PROCDIR "/%s", dent->d_name);
+		len = ssnprintf (file, sizeof (file), PROCDIR "/%s", dent->d_name);
 		if ((len < 0) || (len >= BUFSIZE))
 			continue;
 		
@@ -187,7 +189,7 @@ static int vserver_read (void)
 		/* socket message accounting */
 		len = ssnprintf (file, sizeof (file),
 				PROCDIR "/%s/cacct", dent->d_name);
-		if ((len < 0) || (len >= sizeof (file)))
+		if ((len < 0) || ((size_t) len >= sizeof (file)))
 			continue;
 
 		if (NULL == (fh = fopen (file, "r")))
@@ -235,7 +237,7 @@ static int vserver_read (void)
 		/* thread information and load */
 		len = ssnprintf (file, sizeof (file),
 				PROCDIR "/%s/cvirt", dent->d_name);
-		if ((len < 0) || (len >= sizeof (file)))
+		if ((len < 0) || ((size_t) len >= sizeof (file)))
 			continue;
 
 		if (NULL == (fh = fopen (file, "r")))
@@ -288,7 +290,7 @@ static int vserver_read (void)
 		/* processes and memory usage */
 		len = ssnprintf (file, sizeof (file),
 				PROCDIR "/%s/limit", dent->d_name);
-		if ((len < 0) || (len >= sizeof (file)))
+		if ((len < 0) || ((size_t) len >= sizeof (file)))
 			continue;
 
 		if (NULL == (fh = fopen (file, "r")))