rpms/quota
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove a dead code from process_file()

Browse Source
This commit is contained in:
Petr Písař 2020-12-14 16:34:44 +01:00
parent 46caab5068
commit d814f10a3e
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
quota-4.06-quotacheck-Remove-a-dead-code-from-process_file.patch Normal file
View File

@ -0,0 +1,32 @@
From 55f1a0604bd4df6d591674b5bef123be1af84e55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Fri, 20 Nov 2020 15:28:49 +0100
Subject: [PATCH] quotacheck: Remove a dead code from process_file()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The ret variable inicialization is useless because it is assigned in
all (two) subsequent code branches.
Signed-off-by: Petr Písař <ppisar@redhat.com>
Signed-off-by: Jan Kara <jack@suse.cz>
---
quotacheck.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/quotacheck.c b/quotacheck.c
index 5810ced..1b81610 100644
--- a/quotacheck.c
+++ b/quotacheck.c
@@ -672,7 +672,6 @@ Please turn quotas off or use -f to force checking.\n"),
}
}
- ret = 0;
memset(old_info + type, 0, sizeof(old_info[type]));
if (is_tree_qfmt(cfmt))
ret = v2_buffer_file(qfname, fd, type, cfmt);
--
2.26.2

9
quota.spec
View File

@ -13,7 +13,7 @@
Name: quota
Epoch: 1
Version: 4.06
Release: 1%{?dist}
Release: 2%{?dist}
Summary: System administration tools for monitoring users' disk usage
# quota_nld.c, quotaio_xfs.h: GPLv2
# bylabel.c copied from util-linux: GPLv2+
@ -59,6 +59,9 @@ Source4: rpc-rquotad.sysconfig
Patch0: quota-4.06-warnquota-configuration-tunes.patch
# Fix parsing a TCP port number
Patch1: quota-4.03-Validate-upper-bound-of-RPC-port.patch
# Remove a dead code from process_file(), in upstream after 4.06,
# <https://sourceforge.net/p/linuxquota/patches/54/>
Patch2: quota-4.06-quotacheck-Remove-a-dead-code-from-process_file.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bash
@ -181,6 +184,7 @@ Linux/UNIX environment.
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
# Regenerate build scripts
autoreconf -f -i
@ -330,6 +334,9 @@ make check
%changelog
* Mon Dec 14 2020 Petr Pisar <ppisar@redhat.com> - 1:4.06-2
- Remove a dead code from process_file() (upstream bug #54)
* Tue Nov 10 2020 Petr Pisar <ppisar@redhat.com> - 1:4.06-1
- 4.06 bump