summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-04-18 00:58:12 +0200
committerGünther Deschner <gd@samba.org>2009-04-20 01:06:01 +0200
commit62480385c1e551448e40b01fff8e9dee318c29c1 (patch)
treeb41b41a530b2a88b5ce8ab5f4bf540c180f7f500
parentd9aaf3759ac7fd6ce07a347a0138bdfb27a6f929 (diff)
downloadsamba-62480385c1e551448e40b01fff8e9dee318c29c1.tar.gz
samba-62480385c1e551448e40b01fff8e9dee318c29c1.tar.bz2
samba-62480385c1e551448e40b01fff8e9dee318c29c1.zip
s3-printing: use ARRAY_SIZE() macro in forms functions.
Guenther
-rw-r--r--source3/printing/nt_printing.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index b96d64b4be..d6fead11c2 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;
}
/****************************************************************************