ndr_string: Move string length calculation fallback into default case

We are about to add a new enumeration constant (NUM_CHARSETS) to
charset_t. To do that we must have a default case in this switch
statement, or the compiler will refuse to compile it, stating that we
haven’t handled all the cases.

The alternative, adding a case for NUM_CHARSETS, would just look silly.

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

diff --git a/librpc/ndr/ndr_string.c b/librpc/ndr/ndr_string.c
index 82cfe34e21985e40bac7f03955b5870b46228db9..0a9d7ab8b9bf9b7ae8d382c13248a9cba577401d 100644 (file)
--- a/librpc/ndr/ndr_string.c
+++ b/librpc/ndr/ndr_string.c
@@ -811,8 +811,8 @@ _PUBLIC_ uint32_t ndr_charset_length(const void *var, charset_t chset)
        case CH_DOS:
        case CH_UNIX:
                return strlen((const char *)var)+1;
+       default:
+               /* Fallback, this should never happen */
+               return strlen((const char *)var)+1;
        }
-
-       /* Fallback, this should never happen */
-       return strlen((const char *)var)+1;
 }