[SCM] dpkg's main repository branch, master, updated. 1.16.0.3-160-gc819a40

[Guillem Jover]

The following commit has been merged in the master branch:
commit b81ec0a39b7ccba925fb0fb8f0664a0671dbc2dc
Author: Guillem Jover <guil...@debian.org>
Date:   Mon Jul 4 03:19:04 2011 +0200

    libdpkg: Rename variable r to pid in subproc_fork()

diff --git a/lib/dpkg/subproc.c b/lib/dpkg/subproc.c
index 4b9c1e5..4006ffe 100644
--- a/lib/dpkg/subproc.c
+++ b/lib/dpkg/subproc.c
@@ -80,21 +80,21 @@ print_subproc_error(const char *emsg, const char 
*contextstring)
 pid_t
 subproc_fork(void)
 {
-       pid_t r;
+       pid_t pid;
 
-       r = fork();
-       if (r == -1) {
+       pid = fork();
+       if (pid == -1) {
                onerr_abort++;
                ohshite(_("fork failed"));
        }
-       if (r > 0)
-               return r;
+       if (pid > 0)
+               return pid;
 
        /* Push a new error context, so that we don't do the other cleanups,
         * because they'll be done by/in the parent process. */
        push_error_context_func(catch_fatal_error, print_subproc_error, NULL);
 
-       return r;
+       return pid;
 }
 
 int

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org