From: Michael Jeanson <mjeanson@efficios.com>
Date: Tue, 8 Mar 2022 23:16:06 +0000 (-0500)
Subject: Prepare for '-Wimplicit-fallthrough'
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=30eb3927304cbe2bf744604cd997a6e75b674945;p=deliverable%2Flttng-tools.git

Prepare for '-Wimplicit-fallthrough'

In preparation for '-Wextra'

Change-Id: Ice4c5aa7f6ce9107c88f38ec4024a4631589ad73
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/cmd.cpp b/src/bin/lttng-sessiond/cmd.cpp
index 84254f1a5..ff7c03947 100644
--- a/src/bin/lttng-sessiond/cmd.cpp
+++ b/src/bin/lttng-sessiond/cmd.cpp
@@ -1921,8 +1921,8 @@ int cmd_add_context(struct command_ctx *cmd_ctx,
 			ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
 			goto error;
 		}
-		/* break is _not_ missing here. */
 	}
+	/* fall through */
 	case LTTNG_DOMAIN_UST:
 	{
 		struct ltt_ust_session *usess = session->ust_session;
diff --git a/src/bin/lttng-sessiond/event-notifier-error-accounting.cpp b/src/bin/lttng-sessiond/event-notifier-error-accounting.cpp
index 2d2a2aa75..138d51b4d 100644
--- a/src/bin/lttng-sessiond/event-notifier-error-accounting.cpp
+++ b/src/bin/lttng-sessiond/event-notifier-error-accounting.cpp
@@ -1121,8 +1121,8 @@ event_notifier_error_accounting_register_event_notifier(
 					trigger_name, trigger_owner_uid);
 			goto end;
 		}
-		/* fall-through. */
 	}
+	/* fall-through. */
 	case EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_OK:
 		*error_counter_index = local_error_counter_index;
 		status = EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_OK;
diff --git a/src/bin/lttng/commands/destroy.cpp b/src/bin/lttng/commands/destroy.cpp
index 2c51142bf..ed09b6509 100644
--- a/src/bin/lttng/commands/destroy.cpp
+++ b/src/bin/lttng/commands/destroy.cpp
@@ -191,8 +191,8 @@ static int destroy_session(struct lttng_session *session)
 			}
 			break;
 		}
-		/* fall-through. */
 	}
+	/* fall-through. */
 	default:
 		ERR("%sFailed to get the location of the rotation performed during the session's destruction",
 				newline_needed ? "\n" : "");
diff --git a/src/common/hashtable/utils.cpp b/src/common/hashtable/utils.cpp
index 12aed1939..ae34767f0 100644
--- a/src/common/hashtable/utils.cpp
+++ b/src/common/hashtable/utils.cpp
@@ -226,11 +226,14 @@ static void __attribute__((unused)) hashword2(const uint32_t *k, size_t length,
 	switch (length) {
 	case 3 :
 		c += k[2];
+		/* fall through */
 	case 2 :
 		b += k[1];
+		/* fall through */
 	case 1 :
 		a += k[0];
 		final(a, b, c);
+		/* fall through */
 	case 0:     /* case 0: nothing left to add */
 		break;
 	}
@@ -416,17 +419,17 @@ static uint32_t hashlittle(const void *key,
 		}
 
 		switch(length) {                  /* all the case statements fall through */
-		case 12: c+=((uint32_t)k[11])<<24;
-		case 11: c+=((uint32_t)k[10])<<16;
-		case 10: c+=((uint32_t)k[9])<<8;
-		case 9: c+=k[8];
-		case 8: b+=((uint32_t)k[7])<<24;
-		case 7: b+=((uint32_t)k[6])<<16;
-		case 6: b+=((uint32_t)k[5])<<8;
-		case 5: b+=k[4];
-		case 4: a+=((uint32_t)k[3])<<24;
-		case 3: a+=((uint32_t)k[2])<<16;
-		case 2: a+=((uint32_t)k[1])<<8;
+		case 12: c+=((uint32_t)k[11])<<24; /* fall through */
+		case 11: c+=((uint32_t)k[10])<<16; /* fall through */
+		case 10: c+=((uint32_t)k[9])<<8; /* fall through */
+		case 9: c+=k[8]; /* fall through */
+		case 8: b+=((uint32_t)k[7])<<24; /* fall through */
+		case 7: b+=((uint32_t)k[6])<<16; /* fall through */
+		case 6: b+=((uint32_t)k[5])<<8; /* fall through */
+		case 5: b+=k[4]; /* fall through */
+		case 4: a+=((uint32_t)k[3])<<24; /* fall through */
+		case 3: a+=((uint32_t)k[2])<<16; /* fall through */
+		case 2: a+=((uint32_t)k[1])<<8; /* fall through */
 		case 1:
 			a+=k[0];
 			break;
diff --git a/src/common/string-utils/string-utils.cpp b/src/common/string-utils/string-utils.cpp
index 8e6a76adc..c2a508dd1 100644
--- a/src/common/string-utils/string-utils.cpp
+++ b/src/common/string-utils/string-utils.cpp
@@ -66,7 +66,7 @@ void strutils_normalize_star_glob_pattern(char *pattern)
 				goto end;
 			}
 
-			/* Fall through default case. */
+			/* fall through */
 		default:
 			got_star = false;
 			break;