[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 23cd39aae01f1b3b1aee834befa02201e8824819
Author: Guillem Jover <guil...@debian.org>
Date:   Thu Jul 7 09:04:32 2011 +0200

    libdpkg: Rename catch_signals to signo_ignores in subproc module

diff --git a/lib/dpkg/subproc.c b/lib/dpkg/subproc.c
index f38eafe..e00141c 100644
--- a/lib/dpkg/subproc.c
+++ b/lib/dpkg/subproc.c
@@ -35,8 +35,8 @@
 #include <dpkg/dpkg.h>
 #include <dpkg/subproc.h>
 
-static int catch_signals[] = { SIGQUIT, SIGINT };
-static struct sigaction sa_save[array_count(catch_signals)];
+static int signo_ignores[] = { SIGQUIT, SIGINT };
+static struct sigaction sa_save[array_count(signo_ignores)];
 
 void
 subproc_signals_setup(const char *name)
@@ -50,10 +50,10 @@ subproc_signals_setup(const char *name)
        sa.sa_handler = SIG_IGN;
        sa.sa_flags = 0;
 
-       for (i = 0; i < array_count(catch_signals); i++)
-               if (sigaction(catch_signals[i], &sa, &sa_save[i]))
+       for (i = 0; i < array_count(signo_ignores); i++)
+               if (sigaction(signo_ignores[i], &sa, &sa_save[i]))
                        ohshite(_("unable to ignore signal %s before running 
%.250s"),
-                               strsignal(catch_signals[i]), name);
+                               strsignal(signo_ignores[i]), name);
        push_cleanup(subproc_signals_cleanup, ~0, NULL, 0, 0);
        onerr_abort--;
 }
@@ -63,10 +63,10 @@ subproc_signals_cleanup(int argc, void **argv)
 {
        size_t i;
 
-       for (i = 0; i < array_count(catch_signals); i++) {
-               if (sigaction(catch_signals[i], &sa_save[i], NULL)) {
+       for (i = 0; i < array_count(signo_ignores); i++) {
+               if (sigaction(signo_ignores[i], &sa_save[i], NULL)) {
                        fprintf(stderr, _("error un-catching signal %s: %s\n"),
-                               strsignal(catch_signals[i]), strerror(errno));
+                               strsignal(signo_ignores[i]), strerror(errno));
                        onerr_abort++;
                }
        }

-- 
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