X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-string-utils.c;h=e807570663d64f03002bf7f15f67553d87b69b5e;hb=3ef6bd4401315ab4cdcc24759fa2136a44351b56;hp=94de1cf8cd18164a076ccd447300552ebf95688f;hpb=231b5333103e13e81c22caa5dc9410ac688c538d;p=lttng-modules.git

diff --git a/lttng-string-utils.c b/lttng-string-utils.c
index 94de1cf8..e8075706 100644
--- a/lttng-string-utils.c
+++ b/lttng-string-utils.c
@@ -1,22 +1,10 @@
-/*
- * Copyright (C) 2017 Philippe Proulx <pproulx@efficios.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Copyright (C) 2017 Philippe Proulx <pproulx@efficios.com>
  */
 
 #include <linux/types.h>
+#include <wrapper/compiler_attributes.h>
 
 #include <lttng-string-utils.h>
 
@@ -145,139 +133,139 @@ retry:
 	 * Example:
 	 *
 	 *     candidate: hi ev every onyx one
-	 *		^
+	 *                ^
 	 *     pattern:   hi*every*one
-	 *		^
+	 *                ^
 	 *
 	 *     candidate: hi ev every onyx one
-	 *		 ^
+	 *                 ^
 	 *     pattern:   hi*every*one
-	 *		 ^
+	 *                 ^
 	 *
 	 *     candidate: hi ev every onyx one
-	 *		  ^
+	 *                  ^
 	 *     pattern:   hi*every*one
-	 *		  ^
+	 *                  ^
 	 *
 	 *     candidate: hi ev every onyx one
-	 *		  ^
+	 *                  ^
 	 *     pattern:   hi*every*one
-	 *		   ^ MISMATCH
+	 *                   ^ MISMATCH
 	 *
 	 *     candidate: hi ev every onyx one
-	 *		   ^
+	 *                   ^
 	 *     pattern:   hi*every*one
-	 *		   ^
+	 *                   ^
 	 *
 	 *     candidate: hi ev every onyx one
-	 *		   ^^
+	 *                   ^^
 	 *     pattern:   hi*every*one
-	 *		   ^^
+	 *                   ^^
 	 *
 	 *     candidate: hi ev every onyx one
-	 *		   ^ ^
+	 *                   ^ ^
 	 *     pattern:   hi*every*one
-	 *		   ^ ^ MISMATCH
+	 *                   ^ ^ MISMATCH
 	 *
 	 *     candidate: hi ev every onyx one
-	 *		    ^
+	 *                    ^
 	 *     pattern:   hi*every*one
-	 *		   ^ MISMATCH
+	 *                   ^ MISMATCH
 	 *
 	 *     candidate: hi ev every onyx one
-	 *		     ^
+	 *                     ^
 	 *     pattern:   hi*every*one
-	 *		   ^ MISMATCH
+	 *                   ^ MISMATCH
 	 *
 	 *     candidate: hi ev every onyx one
-	 *		      ^
+	 *                      ^
 	 *     pattern:   hi*every*one
-	 *		   ^
+	 *                   ^
 	 *
 	 *     candidate: hi ev every onyx one
-	 *		      ^^
+	 *                      ^^
 	 *     pattern:   hi*every*one
-	 *		   ^^
+	 *                   ^^
 	 *
 	 *     candidate: hi ev every onyx one
-	 *		      ^ ^
+	 *                      ^ ^
 	 *     pattern:   hi*every*one
-	 *		   ^ ^
+	 *                   ^ ^
 	 *
 	 *     candidate: hi ev every onyx one
-	 *		      ^  ^
+	 *                      ^  ^
 	 *     pattern:   hi*every*one
-	 *		   ^  ^
+	 *                   ^  ^
 	 *
 	 *     candidate: hi ev every onyx one
-	 *		      ^   ^
+	 *                      ^   ^
 	 *     pattern:   hi*every*one
-	 *		   ^   ^
+	 *                   ^   ^
 	 *
 	 *     candidate: hi ev every onyx one
-	 *			   ^
+	 *                           ^
 	 *     pattern:   hi*every*one
-	 *			^
+	 *                        ^
 	 *
 	 *     candidate: hi ev every onyx one
-	 *			   ^
+	 *                           ^
 	 *     pattern:   hi*every*one
-	 *			 ^ MISMATCH
+	 *                         ^ MISMATCH
 	 *
 	 *     candidate: hi ev every onyx one
-	 *			    ^
+	 *                            ^
 	 *     pattern:   hi*every*one
-	 *			 ^
+	 *                         ^
 	 *
 	 *     candidate: hi ev every onyx one
-	 *			    ^^
+	 *                            ^^
 	 *     pattern:   hi*every*one
-	 *			 ^^
+	 *                         ^^
 	 *
 	 *     candidate: hi ev every onyx one
-	 *			    ^ ^
+	 *                            ^ ^
 	 *     pattern:   hi*every*one
-	 *			 ^ ^ MISMATCH
+	 *                         ^ ^ MISMATCH
 	 *
 	 *     candidate: hi ev every onyx one
-	 *			     ^
+	 *                             ^
 	 *     pattern:   hi*every*one
-	 *			 ^ MISMATCH
+	 *                         ^ MISMATCH
 	 *
 	 *     candidate: hi ev every onyx one
-	 *			      ^
+	 *                              ^
 	 *     pattern:   hi*every*one
-	 *			 ^ MISMATCH
+	 *                         ^ MISMATCH
 	 *
 	 *     candidate: hi ev every onyx one
-	 *			       ^
+	 *                               ^
 	 *     pattern:   hi*every*one
-	 *			 ^ MISMATCH
+	 *                         ^ MISMATCH
 	 *
 	 *     candidate: hi ev every onyx one
-	 *				^
+	 *                                ^
 	 *     pattern:   hi*every*one
-	 *			 ^ MISMATCH
+	 *                         ^ MISMATCH
 	 *
 	 *     candidate: hi ev every onyx one
-	 *				 ^
+	 *                                 ^
 	 *     pattern:   hi*every*one
-	 *			 ^
+	 *                         ^
 	 *
 	 *     candidate: hi ev every onyx one
-	 *				 ^^
+	 *                                 ^^
 	 *     pattern:   hi*every*one
-	 *			 ^^
+	 *                         ^^
 	 *
 	 *     candidate: hi ev every onyx one
-	 *				 ^ ^
+	 *                                 ^ ^
 	 *     pattern:   hi*every*one
-	 *			 ^ ^
+	 *                         ^ ^
 	 *
 	 *     candidate: hi ev every onyx one
-	 *				 ^  ^
+	 *                                 ^  ^
 	 *     pattern:   hi*every*one
-	 *			 ^  ^ SUCCESS
+	 *                         ^  ^ SUCCESS
 	 */
 	while (c != '\0') {
 		if (p == '\0') {
@@ -315,11 +303,12 @@ retry:
 			p = pattern_get_char_at_cb(p_at,
 				pattern_get_char_at_cb_data);
 
+			lttng_fallthrough;
+		default:
 			/*
-			 * Fall through the default case which will
-			 * compare the escaped character now.
+			 * Default case which will compare the escaped
+			 * character now.
 			 */
-		default:
 			if (p == '\0' || c != p) {
 end_of_pattern:
 				/* Character mismatch OR end of pattern. */