X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=common%2Fcommon.c;h=89f63d70c387956580c1581ed25a71a4bcb522d9;hb=3fadfbc0c91f82c46bd36e6e0657ea93570c9db1;hp=de98e34cf7636f32a2df43c3afb41abce510c98b;hpb=2c2a5bf944c7d0e3f5e2595a92b448b57bd625cf;p=babeltrace.git

diff --git a/common/common.c b/common/common.c
index de98e34c..89f63d70 100644
--- a/common/common.c
+++ b/common/common.c
@@ -31,7 +31,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <babeltrace/assert-internal.h>
+#include <babeltrace2/assert-internal.h>
 #include <stdarg.h>
 #include <ctype.h>
 #include <glib.h>
@@ -39,9 +39,9 @@
 #include <stdio.h>
 #include <wchar.h>
 #include <stdbool.h>
-#include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/common-internal.h>
-#include <babeltrace/compat/unistd-internal.h>
+#include <babeltrace2/babeltrace-internal.h>
+#include <babeltrace2/common-internal.h>
+#include <babeltrace2/compat/unistd-internal.h>
 
 #ifndef __MINGW32__
 #include <pwd.h>
@@ -822,7 +822,7 @@ void bt_common_normalize_star_glob_pattern(char *pattern)
 				goto end;
 			}
 
-			/* Fall through default case. */
+			/* fall-through */
 		default:
 			got_star = false;
 			break;
@@ -1042,6 +1042,7 @@ retry:
 			 * Fall through the default case which compares
 			 * the escaped character now.
 			 */
+			/* fall-through */
 		default:
 			if (at_end_of_pattern(p, pattern, pattern_len) ||
 					*c != *p) {