From 58cb075664d09bc3342729523ee55df2aac28b95 Mon Sep 17 00:00:00 2001 From: Michael Santos Date: Sun, 26 Feb 2017 14:51:44 -0500 Subject: [PATCH] state: set room name/resource before options --- src/xmppipe.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/xmppipe.c b/src/xmppipe.c index 57d0450..d7d576c 100644 --- a/src/xmppipe.c +++ b/src/xmppipe.c @@ -77,6 +77,8 @@ main(int argc, char **argv) state->sm_request_interval = 1; state->sm_fc = 15; state->sm_unacked = 5; + state->room = xmppipe_roomname("stdout"); + state->resource = xmppipe_strdup(XMPPIPE_RESOURCE); jid = xmppipe_getenv("XMPPIPE_USERNAME"); pass = xmppipe_getenv("XMPPIPE_PASSWORD"); @@ -186,12 +188,6 @@ main(int argc, char **argv) state->server = xmppipe_servername(jid); - if (state->room == NULL) - state->room = xmppipe_roomname("stdout"); - - if (state->resource == NULL) - state->resource = xmppipe_strdup(XMPPIPE_RESOURCE); - if (strchr(state->room, '@')) { state->out = xmppipe_strdup(state->room); state->mucjid = xmppipe_mucjid(state->out, state->resource);