74 lines
2.5 KiB
Diff
74 lines
2.5 KiB
Diff
|
From 2fb2a289325e63b603124741ba12a0dedad5fae0 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
||
|
|
Date: Mon, 3 May 2021 17:11:22 +0200
|
||
|
|
Subject: [PATCH] libselinux: drop redundant casts to the same type
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Found by clang-tidy.
|
||
|
|
|
||
|
|
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
|
||
|
|
---
|
||
|
|
libselinux/src/audit2why.c | 2 +-
|
||
|
|
libselinux/src/avc_sidtab.c | 2 +-
|
||
|
|
libselinux/src/is_customizable_type.c | 2 +-
|
||
|
|
libselinux/src/selinux_restorecon.c | 2 +-
|
||
|
|
4 files changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/libselinux/src/audit2why.c b/libselinux/src/audit2why.c
|
||
|
|
index d56b56eb2a1a..029f874f4702 100644
|
||
|
|
--- a/libselinux/src/audit2why.c
|
||
|
|
+++ b/libselinux/src/audit2why.c
|
||
|
|
@@ -275,7 +275,7 @@ static int __policy_init(const char *init_path)
|
||
|
|
}
|
||
|
|
|
||
|
|
sepol_bool_iterate(avc->handle, avc->policydb,
|
||
|
|
- load_booleans, (void *)NULL);
|
||
|
|
+ load_booleans, NULL);
|
||
|
|
|
||
|
|
/* Initialize the sidtab for subsequent use by sepol_context_to_sid
|
||
|
|
and sepol_compute_av_reason. */
|
||
|
|
diff --git a/libselinux/src/avc_sidtab.c b/libselinux/src/avc_sidtab.c
|
||
|
|
index 8dc875608762..8c81cf65d2ef 100644
|
||
|
|
--- a/libselinux/src/avc_sidtab.c
|
||
|
|
+++ b/libselinux/src/avc_sidtab.c
|
||
|
|
@@ -56,7 +56,7 @@ int sidtab_insert(struct sidtab *s, const char * ctx)
|
||
|
|
rc = -1;
|
||
|
|
goto out;
|
||
|
|
}
|
||
|
|
- newctx = (char *) strdup(ctx);
|
||
|
|
+ newctx = strdup(ctx);
|
||
|
|
if (!newctx) {
|
||
|
|
rc = -1;
|
||
|
|
avc_free(newnode);
|
||
|
|
diff --git a/libselinux/src/is_customizable_type.c b/libselinux/src/is_customizable_type.c
|
||
|
|
index 92876f4d9371..1b17860c3622 100644
|
||
|
|
--- a/libselinux/src/is_customizable_type.c
|
||
|
|
+++ b/libselinux/src/is_customizable_type.c
|
||
|
|
@@ -38,7 +38,7 @@ static int get_customizable_type_list(char *** retlist)
|
||
|
|
while (fgets_unlocked(buf, selinux_page_size, fp)
|
||
|
|
&& i < ctr) {
|
||
|
|
buf[strlen(buf) - 1] = 0;
|
||
|
|
- list[i] = (char *) strdup(buf);
|
||
|
|
+ list[i] = strdup(buf);
|
||
|
|
if (!list[i]) {
|
||
|
|
unsigned int j;
|
||
|
|
for (j = 0; j < i; j++)
|
||
|
|
diff --git a/libselinux/src/selinux_restorecon.c b/libselinux/src/selinux_restorecon.c
|
||
|
|
index 6fb9e1ff486d..999aa924ba32 100644
|
||
|
|
--- a/libselinux/src/selinux_restorecon.c
|
||
|
|
+++ b/libselinux/src/selinux_restorecon.c
|
||
|
|
@@ -1152,7 +1152,7 @@ void selinux_restorecon_set_sehandle(struct selabel_handle *hndl)
|
||
|
|
unsigned char *fc_digest;
|
||
|
|
size_t num_specfiles, fc_digest_len;
|
||
|
|
|
||
|
|
- fc_sehandle = (struct selabel_handle *) hndl;
|
||
|
|
+ fc_sehandle = hndl;
|
||
|
|
if (!fc_sehandle)
|
||
|
|
return;
|
||
|
|
|
||
|
|
--
|
||
|
|
2.32.0.rc1
|
||
|
|
|