a85176781b
Rebase on upstream commit 32611aea6543
See
$ cd SELinuxProject/selinux
$ git log --pretty=oneline checkpolicy-3.2..32611aea6543 -- checkpolicy
Resolves: rhbz#1988267
53 lines
2.0 KiB
Diff
53 lines
2.0 KiB
Diff
From babc3d53518b7f9f01b83b9c997f9233a58af92b Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
|
Date: Tue, 6 Jul 2021 19:54:25 +0200
|
|
Subject: [PATCH] checkpolicy: use correct format specifier for unsigned
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
test/dispol.c:288:4: warning: %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'. [invalidPrintfArgType_sint]
|
|
snprintf(buf, sizeof(buf), "unknown (%d)", i);
|
|
^
|
|
test/dismod.c:830:4: warning: %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'. [invalidPrintfArgType_sint]
|
|
snprintf(buf, sizeof(buf), "unknown (%d)", i);
|
|
^
|
|
|
|
Found by Cppcheck.
|
|
|
|
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
|
|
---
|
|
checkpolicy/test/dismod.c | 2 +-
|
|
checkpolicy/test/dispol.c | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/checkpolicy/test/dismod.c b/checkpolicy/test/dismod.c
|
|
index 3408e9b6b767..fadbc8d16695 100644
|
|
--- a/checkpolicy/test/dismod.c
|
|
+++ b/checkpolicy/test/dismod.c
|
|
@@ -827,7 +827,7 @@ static void display_policycaps(policydb_t * p, FILE * fp)
|
|
ebitmap_for_each_positive_bit(&p->policycaps, node, i) {
|
|
capname = sepol_polcap_getname(i);
|
|
if (capname == NULL) {
|
|
- snprintf(buf, sizeof(buf), "unknown (%d)", i);
|
|
+ snprintf(buf, sizeof(buf), "unknown (%u)", i);
|
|
capname = buf;
|
|
}
|
|
fprintf(fp, "\t%s\n", capname);
|
|
diff --git a/checkpolicy/test/dispol.c b/checkpolicy/test/dispol.c
|
|
index 8785b7252824..37f71842c9e6 100644
|
|
--- a/checkpolicy/test/dispol.c
|
|
+++ b/checkpolicy/test/dispol.c
|
|
@@ -285,7 +285,7 @@ static void display_policycaps(policydb_t * p, FILE * fp)
|
|
ebitmap_for_each_positive_bit(&p->policycaps, node, i) {
|
|
capname = sepol_polcap_getname(i);
|
|
if (capname == NULL) {
|
|
- snprintf(buf, sizeof(buf), "unknown (%d)", i);
|
|
+ snprintf(buf, sizeof(buf), "unknown (%u)", i);
|
|
capname = buf;
|
|
}
|
|
fprintf(fp, "\t%s\n", capname);
|
|
--
|
|
2.32.0
|
|
|