From e75678f93f88b30c99f3e54192667b873a3ff680 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Fri, 25 May 2012 12:30:40 -0700 Subject: [PATCH] Refresh of rs-with-acm --- src/acm.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/acm.c b/src/acm.c index d59efcf8..e9733c68 100755 --- a/src/acm.c +++ b/src/acm.c @@ -99,24 +99,18 @@ void ucma_acm_init(void) ucma_set_server_port(); sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); if (sock < 0) - goto err1; + goto out; memset(&addr, 0, sizeof addr); addr.sin_family = AF_INET; addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); addr.sin_port = htons(server_port); ret = connect(sock, (struct sockaddr *) &addr, sizeof(addr)); - if (ret) - goto err2; - - init = 1; - pthread_mutex_unlock(&acm_lock); - return; - -err2: - close(sock); - sock = -1; -err1: + if (ret) { + close(sock); + sock = -1; + } +out: init = 1; pthread_mutex_unlock(&acm_lock); } -- 2.45.2