[dpkg] 188/200: s-s-d: Rename err to ret as the former is a function on BSDs

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository dpkg.

commit 6031615231a9fd4ba1d462aff9a1cb08037ca184
Author: Guillem Jover <guillem at debian.org>
Date:   Sat Feb 11 20:03:20 2017 +0100

    s-s-d: Rename err to ret as the former is a function on BSDs
    
    Do not shadow the global err() with a local variable.
---
 debian/changelog          | 2 ++
 utils/start-stop-daemon.c | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eea8f25..178c395 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ dpkg (1.18.23) UNRELEASED; urgency=medium
   * Portability:
     - Do not redeclare sys_siglist in libcompat when the system does so.
       Thanks to Thomas Klausner <wiz at NetBSD.org>.
+    - Rename err variable to ret in start-stop-daemon as the former is a
+      function on BSDs.
   * Perl modules:
     - Do not special case EM_SPARC32PLUS for NetBSD in Dpkg::Shlibs::Objdump,
       the code has been fixed in NetBSD as that situation could not happen.
diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index b641bc6..976ec72 100644
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -434,10 +434,10 @@ wait_for_child(pid_t pid)
 		fatal("error waiting for child");
 
 	if (WIFEXITED(status)) {
-		int err = WEXITSTATUS(status);
+		int ret = WEXITSTATUS(status);
 
-		if (err != 0)
-			fatal("child returned error exit status %d", err);
+		if (ret != 0)
+			fatal("child returned error exit status %d", ret);
 	} else if (WIFSIGNALED(status)) {
 		int signo = WTERMSIG(status);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git