[master] 2e610e1 More Flexelintery

[Poul-Henning Kamp]

commit 2e610e1cc5f906f81430350cea44117a9d27ddc9
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Apr 26 19:36:27 2017 +0000

    More Flexelintery

diff --git a/bin/varnishd/flint.lnt b/bin/varnishd/flint.lnt
index e6eac30..c276b5d 100644
--- a/bin/varnishd/flint.lnt
+++ b/bin/varnishd/flint.lnt
@@ -136,7 +136,6 @@
 
 // Review all below this line ///////////////////////////////////////////////
 
--e737	// 143 Loss of sign in promotion from ___ to ___
 -e713	// 42 Loss of precision (___) (___ to ___)
 -e574	// 48 Signed-unsigned mix with relational
 -e840	// Use of nul character in a string literal (see: vcc_if.c)
diff --git a/bin/varnishlog/flint.lnt b/bin/varnishlog/flint.lnt
index 518e640..d0d1157 100644
--- a/bin/varnishlog/flint.lnt
+++ b/bin/varnishlog/flint.lnt
@@ -6,7 +6,6 @@
 -efile(451, "varnishlog_options.h")
 
 -e732   // Loss of sign (arg. no. 2) (int to unsigned
--e737	// [45]  Loss of sign in promotion from int to unsigned
 -e713	// Loss of precision (assignment) (unsigned long long to long long)
 -e574	// Signed-unsigned mix with relational
 
diff --git a/bin/varnishncsa/flint.lnt b/bin/varnishncsa/flint.lnt
index d2a0b91..29fa2cd 100644
--- a/bin/varnishncsa/flint.lnt
+++ b/bin/varnishncsa/flint.lnt
@@ -22,6 +22,5 @@
 -e534	// Ignoring return value of function
 -e557	// unrecog format
 -e732   // Loss of sign (arg. no. 2) (int to unsigned
--e737	// [45]  Loss of sign in promotion from int to unsigned
 -e788	// tag not used in defaulted switch
 
diff --git a/bin/varnishstat/flint.lnt b/bin/varnishstat/flint.lnt
index c3971af..7ae5887 100644
--- a/bin/varnishstat/flint.lnt
+++ b/bin/varnishstat/flint.lnt
@@ -11,7 +11,6 @@
 -e763	// Redundant declaration for symbol '...' previously declared
 
 -e732   // Loss of sign (arg. no. 2) (int to unsigned
--e737	// [45]  Loss of sign in promotion from int to unsigned
 -e713	// Loss of precision (assignment) (unsigned long long to long long)
 -e574	// Signed-unsigned mix with relational
 
diff --git a/bin/varnishtest/flint.lnt b/bin/varnishtest/flint.lnt
index e3da9d5..0c2658c 100644
--- a/bin/varnishtest/flint.lnt
+++ b/bin/varnishtest/flint.lnt
@@ -23,7 +23,6 @@
 
 //
 -e732   // Loss of sign (arg. no. 2) (int to unsigned
--e737	// [45]  Loss of sign in promotion from int to unsigned
 -e713	// Loss of precision (assignment) (unsigned long long to long long)
 -e574	// Signed-unsigned mix with relational
 -emacro(835, STRTOU32_CHECK)    // A zero has been given as ___ argument to operator '___'
diff --git a/bin/varnishtop/flint.lnt b/bin/varnishtop/flint.lnt
index eef5d4d..b5dc5fa 100644
--- a/bin/varnishtop/flint.lnt
+++ b/bin/varnishtop/flint.lnt
@@ -5,7 +5,6 @@
 -e763	// Redundant declaration for symbol '...' previously declared
 
 -e732   // Loss of sign (arg. no. 2) (int to unsigned
--e737	// [45]  Loss of sign in promotion from int to unsigned
 -e713	// Loss of precision (assignment) (unsigned long long to long long)
 -e574	// Signed-unsigned mix with relational
 
diff --git a/flint.lnt b/flint.lnt
index 0cea578..38a1678 100644
--- a/flint.lnt
+++ b/flint.lnt
@@ -31,6 +31,7 @@
 -e716		// while(1) ...
 -e726		// Extraneous comma ignored
 -e728		// Symbol ... not explicitly initialized
+-e737		// Loss of sign in promotion from int to unsigned int
 -e763		// Redundant declaration for symbol '...' previously declared
 -e777		// Testing floats for equality
 -e785		// Too few initializers for aggregate
diff --git a/lib/libvarnish/flint.lnt b/lib/libvarnish/flint.lnt
index f246d5c..b134f47 100644
--- a/lib/libvarnish/flint.lnt
+++ b/lib/libvarnish/flint.lnt
@@ -59,7 +59,6 @@
 // Review all below this line ///////////////////////////////////////////////
 
 -e732   // Loss of sign (arg. no. 2) (int to unsigned
--e737	// [45]  Loss of sign in promotion from int to unsigned
 -e713	// Loss of precision (assignment) (unsigned long long to long long)
 -e574	// Signed-unsigned mix with relational
 -e712	// Loss of precision (assignment) (long long to
diff --git a/lib/libvarnishapi/vsl.c b/lib/libvarnishapi/vsl.c
index f1b1846..8e803ce 100644
--- a/lib/libvarnishapi/vsl.c
+++ b/lib/libvarnishapi/vsl.c
@@ -366,8 +366,9 @@ VSL_PrintTransactions(struct VSL_data *vsl, struct VSL_transaction * const pt[],
 			if (t->level > 3)
 				VSL_PRINT(fo, "*%1.1u* ", t->level);
 			else
-				VSL_PRINT(fo, "%-3.*s ", t->level, "***");
-			VSL_PRINT(fo, "%*.s%-14s %*.s%-10u\n",
+				VSL_PRINT(fo, "%-3.*s ",
+				    (int)(t->level), "***");
+			VSL_PRINT(fo, "%*.s%-14s %*.s%-10d\n",
 			    verbose ? 10 + 1 : 0, " ",
 			    VSL_transactions[t->type],
 			    verbose ? 1 + 1 : 0, " ",
@@ -387,7 +388,8 @@ VSL_PrintTransactions(struct VSL_data *vsl, struct VSL_transaction * const pt[],
 			if (t->level > 3)
 				VSL_PRINT(fo, "-%1.1u- ", t->level);
 			else if (t->level)
-				VSL_PRINT(fo, "%-3.*s ", t->level, "---");
+				VSL_PRINT(fo, "%-3.*s ",
+				    (int)(t->level), "---");
 			if (verbose)
 				i = VSL_Print(vsl, t->c, fo);
 			else
diff --git a/lib/libvcc/flint.lnt b/lib/libvcc/flint.lnt
index 7160b2e..6e346b1 100644
--- a/lib/libvcc/flint.lnt
+++ b/lib/libvcc/flint.lnt
@@ -33,7 +33,6 @@
 -e763	// Redundant declaration for symbol '...' previously declared
 
 
--e737	// Loss of sign in promotion from int to unsigned int
 -e534	// Ignoring return value of function
 -e506	// Constant value boolean
 -e774	// Boolean within 'if' always evaluates to False