diff options
| author | Günther Deschner <gd@samba.org> | 2009-04-18 00:58:12 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2009-04-28 09:11:10 +0200 |
| commit | 70e0f5a5f625ff63e76152663f1cc8f71430e3dc (patch) | |
| tree | f78bf6d65c52452fe2dbe8a98f6b62c2dbf46d8d | |
| parent | 25557ed661cd29ab5e237d8f9789bf84adcf35a0 (diff) | |
| download | samba-70e0f5a5f625ff63e76152663f1cc8f71430e3dc.tar.gz | |
s3-printing: use ARRAY_SIZE() macro in forms functions.
Guenther
(cherry picked from commit 62480385c1e551448e40b01fff8e9dee318c29c1)
(cherry picked from commit fea535368e4d62606b522031afc773d4963dbb91)
| -rw-r--r-- | source3/printing/nt_printing.c | 11 |
1 files changed, 5 insertions, 6 deletions
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; } /**************************************************************************** |