bytemark/flexnbd-c
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed a couple of gotos.

Browse Source 
Hadn't you heard?  They're considered harmful.
This commit is contained in:
Patrick J Cherry
2018-11-14 10:23:05 +00:00
parent 391a17bfcc
commit 3fe9f2c6a1
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -4,7 +4,8 @@ VPATH=src:tests/unit
DESTDIR?=/ DESTDIR?=/
PREFIX?=/usr/local/bin PREFIX?=/usr/local/bin
INSTALLDIR=$(DESTDIR)/$(PREFIX) INSTALLDIR=$(DESTDIR)/$(PREFIX)
DEBUG=1
ifdef DEBUG ifdef DEBUG
CFLAGS_EXTRA=-g -DDEBUG CFLAGS_EXTRA=-g -DDEBUG
LDFLAGS_EXTRA=-g LDFLAGS_EXTRA=-g

17
src/proxy/proxy.c
View File

@@ -537,7 +537,7 @@ int proxy_read_init_from_upstream(struct proxier *proxy, int state)
if (count == -1) { if (count == -1) {
warn(SHOW_ERRNO("Failed to read init from upstream")); warn(SHOW_ERRNO("Failed to read init from upstream"));
goto disconnect; return CONNECT_TO_UPSTREAM;
} }
if (proxy->init.needle == proxy->init.size) { if (proxy->init.needle == proxy->init.size) {
@@ -547,7 +547,7 @@ int proxy_read_init_from_upstream(struct proxier *proxy, int state)
((struct nbd_init_raw *) proxy->init.buf, &upstream_size, ((struct nbd_init_raw *) proxy->init.buf, &upstream_size,
&upstream_flags)) { &upstream_flags)) {
warn("Upstream sent invalid init"); warn("Upstream sent invalid init");
goto disconnect; return CONNECT_TO_UPSTREAM;
} }
/* record the flags, and log the reconnection, set TCP_NODELAY */ /* record the flags, and log the reconnection, set TCP_NODELAY */
@@ -565,9 +565,6 @@ int proxy_read_init_from_upstream(struct proxier *proxy, int state)
} }
return state; return state;
disconnect:
return CONNECT_TO_UPSTREAM;
} }
int proxy_write_to_upstream(struct proxier *proxy, int state) int proxy_write_to_upstream(struct proxier *proxy, int state)
@@ -625,7 +622,7 @@ int proxy_read_from_upstream(struct proxier *proxy, int state)
if (count == -1) { if (count == -1) {
warn(SHOW_ERRNO("Failed to get reply from upstream")); warn(SHOW_ERRNO("Failed to get reply from upstream"));
goto disconnect; return CONNECT_TO_UPSTREAM;
} }
if (proxy->rsp.needle == NBD_REPLY_SIZE) { if (proxy->rsp.needle == NBD_REPLY_SIZE) {
@@ -633,7 +630,7 @@ int proxy_read_from_upstream(struct proxier *proxy, int state)
if (reply->magic != REPLY_MAGIC) { if (reply->magic != REPLY_MAGIC) {
warn("Reply magic is incorrect"); warn("Reply magic is incorrect");
goto disconnect; return CONNECT_TO_UPSTREAM;
} }
if (proxy->req_hdr.type == REQUEST_READ) { if (proxy->req_hdr.type == REQUEST_READ) {
@@ -649,9 +646,6 @@ int proxy_read_from_upstream(struct proxier *proxy, int state)
} }
return state; return state;
disconnect:
return CONNECT_TO_UPSTREAM;
} }
@@ -861,8 +855,7 @@ void proxy_session(struct proxier *proxy)
*/ */
if (old_state == state && proxy_state_upstream(state)) { if (old_state == state && proxy_state_upstream(state)) {
if ((monotonic_time_ms()) - state_started > UPSTREAM_TIMEOUT) { if ((monotonic_time_ms()) - state_started > UPSTREAM_TIMEOUT) {
warn("Timed out in state %s while communicating with upstream", proxy_session_state_names[state] warn("Timed out in state %s while communicating with upstream", proxy_session_state_names[state]);
);
state = CONNECT_TO_UPSTREAM; state = CONNECT_TO_UPSTREAM;
} }
} }