c59879b8aa
Rebase on upstream commit 32611aea6543
See
$ cd SELinuxProject/selinux
$ git log --pretty=oneline libsepol-3.2..32611aea6543 -- libsepol
45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
From 811185648af2ec8a6b11b54484cbe9d19ba452fa Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
|
Date: Tue, 8 Jun 2021 17:59:09 +0200
|
|
Subject: [PATCH] libsepol: drop repeated semicolons
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
|
|
Acked-by: James Carter <jwcart2@gmail.com>
|
|
---
|
|
libsepol/src/kernel_to_cil.c | 2 +-
|
|
libsepol/src/module.c | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/libsepol/src/kernel_to_cil.c b/libsepol/src/kernel_to_cil.c
|
|
index 5aaee6288565..336d53b09ff9 100644
|
|
--- a/libsepol/src/kernel_to_cil.c
|
|
+++ b/libsepol/src/kernel_to_cil.c
|
|
@@ -1050,7 +1050,7 @@ static char *cats_ebitmap_to_str(struct ebitmap *cats, char **val_to_name)
|
|
p = catsbuf;
|
|
|
|
*p++ = '(';
|
|
- remaining--;;
|
|
+ remaining--;
|
|
|
|
range = 0;
|
|
ebitmap_for_each_positive_bit(cats, node, i) {
|
|
diff --git a/libsepol/src/module.c b/libsepol/src/module.c
|
|
index 836da308f8d3..9b53bc470952 100644
|
|
--- a/libsepol/src/module.c
|
|
+++ b/libsepol/src/module.c
|
|
@@ -82,7 +82,7 @@ static int policy_file_length(struct policy_file *fp, size_t *out)
|
|
break;
|
|
case PF_USE_MEMORY:
|
|
*out = fp->size;
|
|
- break;;
|
|
+ break;
|
|
default:
|
|
*out = 0;
|
|
break;
|
|
--
|
|
2.32.0
|
|
|