diff options
| author | pjd <pjd@FreeBSD.org> | 2012-01-13 23:25:35 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2012-01-13 23:25:35 +0000 |
| commit | b07aec8b25cb766e3da445ecc6e63257a63efa00 (patch) | |
| tree | 41a32913376e40c2acbabe45010d33d8273e8710 /sbin/hastd | |
| parent | b05525eee189400e2e6bba9c83e024310df1ecc0 (diff) | |
| download | FreeBSD-src-b07aec8b25cb766e3da445ecc6e63257a63efa00.zip FreeBSD-src-b07aec8b25cb766e3da445ecc6e63257a63efa00.tar.gz | |
Style cleanups.
MFC after: 3 days
Diffstat (limited to 'sbin/hastd')
| -rw-r--r-- | sbin/hastd/secondary.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/sbin/hastd/secondary.c b/sbin/hastd/secondary.c index c7e2ab8..8ebcd48 100644 --- a/sbin/hastd/secondary.c +++ b/sbin/hastd/secondary.c @@ -282,8 +282,10 @@ init_remote(struct hast_resource *res, struct nv *nvin) (uintmax_t)resuid, (uintmax_t)res->hr_resuid); pjdlog_error("%s", errmsg); nv_add_string(nvout, errmsg, "errmsg"); - if (hast_proto_send(res, res->hr_remotein, nvout, NULL, 0) == -1) { - pjdlog_exit(EX_TEMPFAIL, "Unable to send response to %s", + if (hast_proto_send(res, res->hr_remotein, nvout, + NULL, 0) == -1) { + pjdlog_exit(EX_TEMPFAIL, + "Unable to send response to %s", res->hr_remoteaddr); } nv_free(nvout); @@ -327,8 +329,10 @@ init_remote(struct hast_resource *res, struct nv *nvin) free(map); pjdlog_error("Split-brain detected, exiting."); nv_add_string(nvout, "Split-brain condition!", "errmsg"); - if (hast_proto_send(res, res->hr_remotein, nvout, NULL, 0) == -1) { - pjdlog_exit(EX_TEMPFAIL, "Unable to send response to %s", + if (hast_proto_send(res, res->hr_remotein, nvout, + NULL, 0) == -1) { + pjdlog_exit(EX_TEMPFAIL, + "Unable to send response to %s", res->hr_remoteaddr); } nv_free(nvout); @@ -475,7 +479,8 @@ hastd_secondary(struct hast_resource *res, struct nv *nvin) } static void -reqlog(int loglevel, int debuglevel, int error, struct hio *hio, const char *fmt, ...) +reqlog(int loglevel, int debuglevel, int error, struct hio *hio, + const char *fmt, ...) { char msg[1024]; va_list ap; @@ -838,7 +843,7 @@ send_thread(void *arg) nv_add_int16(nvout, hio->hio_error, "error"); if (hast_proto_send(res, res->hr_remoteout, nvout, data, length) == -1) { - secondary_exit(EX_TEMPFAIL, "Unable to send reply."); + secondary_exit(EX_TEMPFAIL, "Unable to send reply"); } nv_free(nvout); pjdlog_debug(2, "send: (%p) Moving request to the free queue.", |
