From: Günther Deschner <gd@samba.org>
Date: Fri, 17 Apr 2009 22:58:12 +0000 (+0200)
Subject: s3-printing: use ARRAY_SIZE() macro in forms functions.
X-Git-Tag: tdb-1.1.5~958^2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62480385c1e551448e40b01fff8e9dee318c29c1;p=thirdparty%2Fsamba.git

s3-printing: use ARRAY_SIZE() macro in forms functions.

Guenther
---

diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index b96d64b4beb..d6fead11c2d 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -745,7 +745,7 @@ int get_builtin_ntforms(nt_forms_struct **list)
 	if (!*list) {
 		return 0;
 	}
-	return sizeof(default_forms) / sizeof(default_forms[0]);
+	return ARRAY_SIZE(default_forms);
 }
 
 /****************************************************************************
@@ -754,18 +754,17 @@ int get_builtin_ntforms(nt_forms_struct **list)
 
 bool get_a_builtin_ntform_by_string(const char *form_name, nt_forms_struct *form)
 {
-	int i,count;
+	int i;
 	DEBUGADD(6,("Looking for builtin form %s \n", form_name));
-	count = sizeof(default_forms) / sizeof(default_forms[0]);
-	for (i=0;i<count;i++) {
+	for (i=0; i<ARRAY_SIZE(default_forms); i++) {
 		if (strequal(form_name,default_forms[i].name)) {
 			DEBUGADD(6,("Found builtin form %s \n", form_name));
 			memcpy(form,&default_forms[i],sizeof(*form));
-			break;
+			return true;
 		}
 	}
 
-	return (i !=count);
+	return false;
 }
 
 /****************************************************************************