rpms/libnxz
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix an issue with GCC 12

Browse Source
This commit is contained in:
Tulio Magno Quites Machado Filho 2022-01-26 11:52:40 -03:00 committed by Tulio Magno Quites Machado Filho
parent fd269e75d2
commit 5daf109393
2 changed files with 72 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
gcc12.patch Normal file
View File

@ -0,0 +1,67 @@
From 28c9671c39d50934da68c16a8c6730288e53e11e Mon Sep 17 00:00:00 2001
From: Matheus Castanho <msc@linux.ibm.com>
Date: Thu, 7 Oct 2021 13:58:48 -0300
Subject: [PATCH] Remove unnecessary checks during configuration processing
GCC 12 (dev) started to complain that some NULL checks were not necessary as the
values could never be NULL. The warnings seem to be correct, so the checks have
been removed.
In find_cfg and nx_dump_cfg the loop iterates over a maximum of
cfg_table->cfg_num elements. As long as cfg_num is at most MAX_CONFIG_ITEM, we
are fine because cfg_table can hold that many elements, and key and val are
pointers to "static" arrays inside struct cfg_item.
In set_cfg, we access key and val of item at index cfg_cnt, which is guarded by
the function to be less than MAX_CONFIG_ITEM, so we are guaranteed to access
initialized data.
Tested with gcc 11.1.1 and gcc 12.0.0 (rev 5f0285418940).
Signed-off-by: Matheus Castanho <msc@linux.ibm.com>
---
lib/nx_utils.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/lib/nx_utils.c b/lib/nx_utils.c
index 5e01745..5386359 100644
--- a/lib/nx_utils.c
+++ b/lib/nx_utils.c
@@ -99,8 +99,6 @@ static int find_cfg(char *key, struct nx_cfg_tab *cfg_table)
configs = cfg_table->configs;
for (i = 0; i < cfg_table->cfg_num; i++) {
- if (!configs[i].key)
- continue;
if (strcmp(key, configs[i].key) == 0)
return i;
}
@@ -138,9 +136,6 @@ static int set_cfg(struct nx_cfg_tab *cfg_table, char *key, char *val, int cnt)
} else
ret = 0;
- if (!configs[cfg_cnt].key || !configs[cfg_cnt].val)
- return -1;
-
memcpy(configs[cfg_cnt].key, trim_key, key_size);
if (trim_space(configs[cfg_cnt].val, MAX_CONFIG_LINE, val) < 0) {
/* val is all space, or lengh of val larger than MAX_CONFIG_LINE,
@@ -154,15 +149,14 @@ static int set_cfg(struct nx_cfg_tab *cfg_table, char *key, char *val, int cnt)
int nx_dump_cfg(struct nx_cfg_tab *cfg_table, FILE *fp)
{
int i;
- char *key, *val;
+
if (!cfg_table || !fp)
return -1;
fprintf(fp, "nx-zlib config file ========\n");
for (i = 0; i < cfg_table->cfg_num; i++) {
- key = (!cfg_table->configs[i].key) ? "NULL" : cfg_table->configs[i].key;
- val = (!cfg_table->configs[i].val) ? "NULL" : cfg_table->configs[i].val;
- fprintf(fp, "[%d]: %s = %s\n", i, key, val);
+ fprintf(fp, "[%d]: %s = %s\n", i, cfg_table->configs[i].key,
+ cfg_table->configs[i].val);
}
return 0;

5
libnxz.spec
View File

@ -9,6 +9,8 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
# Stop depending on a git repository when running make.
Patch0: rm-git.patch
# Avoid warnings when building with GCC 12.
Patch1: gcc12.patch
# Be explicit about the soname in order to avoid unintentional changes.
%global soname libnxz.so.0.62
@ -69,6 +71,9 @@ make install PREFIX="%{buildroot}%{_prefix}" LIBDIR="%{buildroot}%{_libdir}"
%{_libdir}/libnxz.a
%changelog
* Wed Jan 26 2022 Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com> - 0.62-4
- Fix issue with GCC 12.
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.62-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild