From b6c35d03c101ae822263a76e39cf1b016b415268 Mon Sep 17 00:00:00 2001 From: Joseph Sutton Date: Wed, 2 Aug 2023 10:04:23 +1200 Subject: [PATCH] ndr_string: Move string length calculation fallback into default case MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Andrew Bartlett --- librpc/ndr/ndr_string.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/librpc/ndr/ndr_string.c b/librpc/ndr/ndr_string.c index 82cfe34e219..0a9d7ab8b9b 100644 --- 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; } -- 2.47.3