[spp] [PATCH 34/57] spp_vf: modify conditional statement

[x-fn-spp at sl.ntt-tx.co.jp]

From: Hiroyuki Nakamura <nakamura.hioryuki at po.ntt-tx.co.jp>

Modify followings:
* Comments on function's return value.
* Conditional statement for the actions corresponding to return values
  of spp_receive_message.

Signed-off-by: Daiki Yamashita <yamashita.daiki.z01 at as.ntt-tx.co.jp>
Signed-off-by: Yasufum Ogawa <ogawa.yasufumi at lab.ntt.co.jp>
---
 src/vf/command_conn.h |  8 ++++----
 src/vf/command_proc.c | 11 +++++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/vf/command_conn.h b/src/vf/command_conn.h
index 932c647..d414ec6 100644
--- a/src/vf/command_conn.h
+++ b/src/vf/command_conn.h
@@ -15,8 +15,8 @@
  * @param controller_port
  *  controller listen port number.
  *
- * @retval 0                     succeeded.
- * @retval SPP_CONNERR_TEMPORARY temporary error. please retry.
+ * @retval 0  succeeded.
+ * @retval -1 failed.
  */
 int spp_command_conn_init(const char *controller_ip, int controller_port);
 
@@ -28,8 +28,8 @@ int spp_command_conn_init(const char *controller_ip, int controller_port);
  * @param sock
  *  socket that connect to controller.
  *
- * @retval 0 succeeded.
- * @retval -1 failed.
+ * @retval 0                     succeeded.
+ * @retval SPP_CONNERR_TEMPORARY temporary error. please retry.
  */
 int spp_connect_to_controller(int *sock);
 
diff --git a/src/vf/command_proc.c b/src/vf/command_proc.c
index c921b51..50418cc 100644
--- a/src/vf/command_proc.c
+++ b/src/vf/command_proc.c
@@ -418,10 +418,13 @@ spp_command_proc_do(void)
 		return 0;
 
 	msg_ret = spp_receive_message(&sock, &msgbuf);
-	if (unlikely(msg_ret == 0 || msg_ret == SPP_CONNERR_TEMPORARY)) {
-		return 0;
-	} else if (unlikely(msg_ret < 0)) {
-		return -1;
+	if (unlikely(msg_ret <= 0)) {
+		if (likely(msg_ret == 0))
+			return 0;
+		else if (unlikely(msg_ret == SPP_CONNERR_TEMPORARY))
+			return 0;
+		else
+			return -1;
 	}
 
 	for (i = 0; i < msg_ret; ++i) {
-- 
1.9.1