X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=common%2Fcommon.c;h=68f537ba0187c08f0f5bfc89fdf83df6babe8d20;hb=3cdfbaeab23e6ed4268d606cb67c50ec9e8646a0;hp=78ed26ab79205332fedacded6bf1b0421be9b0b2;hpb=f6ccaed94e575af57fe6bf38154771bee4871a2a;p=babeltrace.git

diff --git a/common/common.c b/common/common.c
index 78ed26ab..68f537ba 100644
--- a/common/common.c
+++ b/common/common.c
@@ -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) {
@@ -1334,28 +1335,28 @@ static inline void handle_conversion_specifier_std(char *buf, char **buf_ch,
 	}
 
 	/* format (PRI*64) */
-	if (strncmp(fmt_ch, PRId64, sizeof(PRId64)) == 0) {
-		fmt_ch += sizeof(PRId64);
+	if (strncmp(fmt_ch, PRId64, sizeof(PRId64) - 1) == 0) {
+		fmt_ch += sizeof(PRId64) - 1;
 		BUF_STD_APPEND_SINGLE_ARG(int64_t);
 		goto update_rw_fmt;
-	} else if (strncmp(fmt_ch, PRIu64, sizeof(PRIu64)) == 0) {
-		fmt_ch += sizeof(PRIu64);
+	} else if (strncmp(fmt_ch, PRIu64, sizeof(PRIu64) - 1) == 0) {
+		fmt_ch += sizeof(PRIu64) - 1;
 		BUF_STD_APPEND_SINGLE_ARG(uint64_t);
 		goto update_rw_fmt;
-	} else if (strncmp(fmt_ch, PRIx64, sizeof(PRIx64)) == 0) {
-		fmt_ch += sizeof(PRIx64);
+	} else if (strncmp(fmt_ch, PRIx64, sizeof(PRIx64) - 1) == 0) {
+		fmt_ch += sizeof(PRIx64) - 1;
 		BUF_STD_APPEND_SINGLE_ARG(uint64_t);
 		goto update_rw_fmt;
-	} else if (strncmp(fmt_ch, PRIX64, sizeof(PRIX64)) == 0) {
-		fmt_ch += sizeof(PRIX64);
+	} else if (strncmp(fmt_ch, PRIX64, sizeof(PRIX64) - 1) == 0) {
+		fmt_ch += sizeof(PRIX64) - 1;
 		BUF_STD_APPEND_SINGLE_ARG(uint64_t);
 		goto update_rw_fmt;
-	} else if (strncmp(fmt_ch, PRIo64, sizeof(PRIo64)) == 0) {
-		fmt_ch += sizeof(PRIo64);
+	} else if (strncmp(fmt_ch, PRIo64, sizeof(PRIo64) - 1) == 0) {
+		fmt_ch += sizeof(PRIo64) - 1;
 		BUF_STD_APPEND_SINGLE_ARG(uint64_t);
 		goto update_rw_fmt;
-	} else if (strncmp(fmt_ch, PRIi64, sizeof(PRIi64)) == 0) {
-		fmt_ch += sizeof(PRIi64);
+	} else if (strncmp(fmt_ch, PRIi64, sizeof(PRIi64) - 1) == 0) {
+		fmt_ch += sizeof(PRIi64) - 1;
 		BUF_STD_APPEND_SINGLE_ARG(int64_t);
 		goto update_rw_fmt;
 	}
@@ -1521,7 +1522,6 @@ void bt_common_custom_vsnprintf(char *buf, size_t buf_size,
 
 	BT_ASSERT(buf);
 	BT_ASSERT(fmt);
-	BT_ASSERT(*args);
 
 	while (*fmt_ch != '\0') {
 		switch (*fmt_ch) {