lib:charset: Update NUM_CHARSETS to reflect true value

CH_DISPLAY was removed in commit
125a2ff262aa312df20eec68802fd5f8a47f492f, but NUM_CHARSETS was not
updated to match.

By assigning to NUM_CHARSETS the last enumeration value in charset_t, we
guard against its falling out of sync again.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/lib/util/charset/charset.h b/lib/util/charset/charset.h
index c62832cccd635fdc77e8128b1b9d0b9ad9feb5f2..4eaee1bbb7c6bd173236d0692211783c4aa79f13 100644 (file)
--- a/lib/util/charset/charset.h
+++ b/lib/util/charset/charset.h
@@ -28,9 +28,17 @@
 #include <talloc.h>
 
 /* this defines the charset types used in samba */
-typedef enum {CH_UTF16LE=0, CH_UTF16=0, CH_UNIX, CH_DOS, CH_UTF8, CH_UTF16BE, CH_UTF16MUNGED} charset_t;
-
-#define NUM_CHARSETS 7
+typedef enum {
+       CH_UTF16LE = 0,
+       CH_UTF16 = 0,
+       CH_UNIX,
+       CH_DOS,
+       CH_UTF8,
+       CH_UTF16BE,
+       CH_UTF16MUNGED,
+       /* The number of distinct character sets. */
+       NUM_CHARSETS
+} charset_t;
 
 /*
  * SMB UCS2 (16-bit unicode) internal type.