From 70cd25be8b07743816b9376f9d219453f0f906fc Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Fri, 25 Feb 2005 14:08:30 +0000
Subject: r5555: current with 3.0 tree as of r5548; getting ready for
 3.0.12pre1

---
 source/lib/util_str.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source/lib/util_str.c')

diff --git a/source/lib/util_str.c b/source/lib/util_str.c
index 60fe1306c8e..f99c2d1fb32 100644
--- a/source/lib/util_str.c
+++ b/source/lib/util_str.c
@@ -1558,8 +1558,8 @@ int fstr_sprintf(fstring s, const char *fmt, ...)
 
  size_t strnlen(const char *s, size_t n)
 {
-	int i;
-	for (i=0; s[i] && i<n; i++)
+	size_t i;
+	for (i=0; i<n && s[i] != '\0'; i++)
 		/* noop */ ;
 	return i;
 }
-- 
cgit v1.2.1