Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib/librumpclient * use _exit() instead of exit() in retryco...



details:   https://anonhg.NetBSD.org/src/rev/4ab8cae7266e
branches:  trunk
changeset: 763059:4ab8cae7266e
user:      pooka <pooka%NetBSD.org@localhost>
date:      Wed Mar 09 15:09:21 2011 +0000

description:
* use _exit() instead of exit() in retryconn=die: atexit() handlers
  may hang if the server is dead
* consistent use of data

diffstat:

 lib/librumpclient/rumpclient.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r e9619e7a8de6 -r 4ab8cae7266e lib/librumpclient/rumpclient.c
--- a/lib/librumpclient/rumpclient.c    Wed Mar 09 15:03:18 2011 +0000
+++ b/lib/librumpclient/rumpclient.c    Wed Mar 09 15:09:21 2011 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: rumpclient.c,v 1.42 2011/03/08 18:28:01 pooka Exp $   */
+/*      $NetBSD: rumpclient.c,v 1.43 2011/03/09 15:09:21 pooka Exp $   */
 
 /*
  * Copyright (c) 2010, 2011 Antti Kantee.  All Rights Reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: rumpclient.c,v 1.42 2011/03/08 18:28:01 pooka Exp $");
+__RCSID("$NetBSD: rumpclient.c,v 1.43 2011/03/09 15:09:21 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/event.h>
@@ -111,7 +111,7 @@
                                break;
                        }
                        if (retrytimo == RUMPCLIENT_RETRYCONN_DIE)
-                               exit(1);
+                               _exit(1);
 
                        if (!prevreconmsg) {
                                prevreconmsg = time(NULL);
@@ -329,7 +329,7 @@
        int cancel, bool haslock)
 {
        struct handshake_fork rf;
-       const char *myprogname;
+       const char *myprogname = NULL; /* XXXgcc */
        struct rsp_hdr rhdr;
        struct respwait rw;
        sigset_t omask;
@@ -362,7 +362,7 @@
                rf.rf_cancel = cancel;
                IOVPUT(iov[1], rf);
        } else {
-               IOVPUT_WITHSIZE(iov[1], __UNCONST(getprogname()), bonus);
+               IOVPUT_WITHSIZE(iov[1], __UNCONST(myprogname), bonus);
        }
        rv = send_with_recon(spc, iov, __arraycount(iov));
        if (rv || cancel) {



Home | Main Index | Thread Index | Old Index