accelio: Some clang-tidy fixes

yanburman · yanburman · commit 1a69449fb35b · 2023-01-17T11:04:45.000+02:00
Signed-off-by: Yan Burman &lt;yanburman@users.noreply.github.com&gt;
diff --git a/examples/usr/hello_world/xio_server.c b/examples/usr/hello_world/xio_server.c
@@ -150,7 +150,7 @@ static int on_session_event(struct xio_session *session,
 		break;
 	default:
 		break;
-	};
+	}
 
 	return 0;
 }
diff --git a/src/common/xio_connection.c b/src/common/xio_connection.c
@@ -175,7 +175,7 @@ char *xio_connection_state_str(enum xio_connection_state state)
 	}
 
 	return NULL;
-};
+}
 
 /*---------------------------------------------------------------------------*/
 /* xio_is_connection_online						     */
@@ -3120,7 +3120,7 @@ int xio_on_fin_ack_recv(struct xio_connection *connection,
 	connection->state = transition->next_state;
 
 	if (connection->state == XIO_CONNECTION_STATE_TIME_WAIT) {
-		int retval = xio_ctx_add_delayed_work(
+		retval = xio_ctx_add_delayed_work(
 				connection->ctx,
 				2, connection,
 				xio_close_time_wait,
diff --git a/src/common/xio_error.c b/src/common/xio_error.c
@@ -129,7 +129,7 @@ static const char *xio_gen_status_str(enum xio_status ev)
 		return "Application resources are temporary unavailable";
 	default:
 		return "Unknown error";
-	};
+	}
 }
 
 /*---------------------------------------------------------------------------*/
diff --git a/src/common/xio_nexus.c b/src/common/xio_nexus.c
@@ -1653,7 +1653,7 @@ static int xio_nexus_on_new_message(struct xio_nexus *nexus,
 			ERROR_LOG("unexpected message type %u\n",
 				  task->tlv_type);
 		break;
-	};
+	}
 
 	if (retval != 0) {
 		ERROR_LOG("failed to handle message. " \
@@ -1684,7 +1684,7 @@ static int xio_nexus_on_send_completion(struct xio_nexus *nexus,
 	default:
 		retval = xio_nexus_on_send_msg_comp(nexus, task);
 		break;
-	};
+	}
 
 	if (retval != 0) {
 		ERROR_LOG("failed to handle message. " \
@@ -1843,7 +1843,7 @@ static int xio_nexus_on_transport_event(void *observer, void *sender,
 
 		tx = 0;
 		break;
-	};
+	}
 
 	if (tx && !list_empty(&nexus->tx_queue))
 		xio_nexus_xmit(nexus);
diff --git a/src/common/xio_session.c b/src/common/xio_session.c
@@ -1853,7 +1853,7 @@ const char *xio_session_event_str(enum xio_session_event event)
 		return "connection reconnecting";
 	case XIO_SESSION_CONNECTION_RECONNECTED_EVENT:
 		return "connection reconnected";
-	};
+	}
 	return "unknown session event";
 }
 EXPORT_SYMBOL(xio_session_event_str);
diff --git a/src/common/xio_session_client.c b/src/common/xio_session_client.c
@@ -1002,7 +1002,6 @@ struct xio_connection *xio_connect(struct xio_connection_params *cparams)
 		}
 	} else if (session->state == XIO_SESSION_STATE_ONLINE ||
 		   session->state == XIO_SESSION_STATE_ACCEPTED) {
-		struct xio_nexus *nexus;
 		char *portal;
 
 		if (cparams->conn_idx == 0) {
diff --git a/src/usr/transport/rdma/xio_rdma_datapath.c b/src/usr/transport/rdma/xio_rdma_datapath.c
@@ -4572,7 +4572,7 @@ static int xio_rdma_on_recv_req(struct xio_rdma_transport *rdma_hndl,
 		xio_set_error(XIO_E_MSG_INVALID);
 		task->status = XIO_E_MSG_INVALID;
 		break;
-	};
+	}
 
 	/* must delay the send due to pending rdma read requests
 	 * if not user will get out of order messages - need fence
diff --git a/src/usr/transport/rdma/xio_rdma_management.c b/src/usr/transport/rdma/xio_rdma_management.c
@@ -1016,7 +1016,7 @@ static int xio_qp_create(struct xio_rdma_transport *rdma_hndl)
 		default:
 			ERROR_LOG("rdma_create_qp failed. (errno=%d %m)\n", errno);
 			break;
-		};
+		}
 		goto destroy_cq;
 	}
 	rdma_hndl->tcq          = tcq;
@@ -2600,7 +2600,7 @@ static void on_cm_error(struct rdma_cm_event *ev,
 	default:
 		reason = XIO_E_NOT_SUPPORTED;
 		break;
-	};
+	}
 	if (rdma_hndl->state == XIO_TRANSPORT_STATE_CONNECTED) {
 		rdma_hndl->state = XIO_TRANSPORT_STATE_DISCONNECTED;
 		retval = xio_rdma_disconnect(rdma_hndl, 0);
@@ -2743,7 +2743,7 @@ static void xio_handle_cm_event(struct rdma_cm_event *ev,
 	default:
 		on_cm_error(ev, rdma_hndl);
 		break;
-	};
+	}
 	rdma_hndl->handler_nesting--;
 
 	/* state can be modified to destroyed (side effect) */
diff --git a/src/usr/transport/rdma/xio_rdma_utils.c b/src/usr/transport/rdma/xio_rdma_utils.c
@@ -212,7 +212,7 @@ const char *xio_cm_rej_reason_str(int reason)
 		return "Invalid Alt Flow Label";
 	default:
 		return "Unknown error";
-	};
+	}
 }
 
 void xio_validate_ulimit_memlock(void)
diff --git a/src/usr/transport/rdma/xio_rdma_verbs.c b/src/usr/transport/rdma/xio_rdma_verbs.c
@@ -180,7 +180,7 @@ const char *ibv_wc_opcode_str(enum ibv_wc_opcode opcode)
 	case IBV_WC_RECV:		return "IBV_WC_RECV";
 	case IBV_WC_RECV_RDMA_WITH_IMM: return "IBV_WC_RECV_RDMA_WITH_IMM";
 	default:			return "IBV_WC_UNKNOWN";
-	};
+	}
 }
 
 /*---------------------------------------------------------------------------*/
@@ -291,7 +291,7 @@ static struct xio_mr *xio_reg_mr_ex(struct xio_context *ctx,
 	int				retval;
 	static int			init_transport = 1;
 
-	/* Show a warning in case the memory is non aligned */
+	/* Show a warning in case the memory is non-aligned */
 	/*
 	if ((access & IBV_XIO_ACCESS_ALLOCATE_MR) == 0 &&
 	    ((uintptr_t)(*addr) & (page_size - 1)) != 0) {
@@ -325,7 +325,7 @@ static struct xio_mr *xio_reg_mr_ex(struct xio_context *ctx,
 		goto cleanup2;
 	}
 	INIT_LIST_HEAD(&tmr->dm_list);
-	/* xio_dereg_mr may be called on error path and it will call
+	/* xio_dereg_mr may be called on error path, and it will call
 	 * list_del on mr_list_entry, make sure it is initialized
 	 */
 	INIT_LIST_HEAD(&tmr->mr_list_entry);
@@ -442,7 +442,7 @@ uint32_t xio_lookup_rkey_by_response(const struct xio_reg_mem *reg_mem,
 
 /*---------------------------------------------------------------------------*/
 /* xio_reg_mr_add_dev							     */
-/* add a new discovered device to a the mr list				     */
+/* add a new discovered device to the mr list				     */
 /*---------------------------------------------------------------------------*/
 int xio_reg_mr_add_dev(struct xio_device *dev)
 {
diff --git a/src/usr/transport/tcp/xio_tcp_datapath.c b/src/usr/transport/tcp/xio_tcp_datapath.c
@@ -1047,7 +1047,7 @@ void xio_tcp_disconnect_helper(void *xio_tcp_hndl)
 					&tcp_task->comp_work);
 		}
 	} else {
-		/* call disconnect if no message to flush other wise defer */
+		/* call disconnect if no message to flush otherwise defer */
 		xio_context_add_event(tcp_hndl->base.ctx,
 				&tcp_hndl->disconnect_event);
 	}
@@ -2612,7 +2612,7 @@ static int xio_tcp_on_recv_req_header(struct xio_tcp_transport *tcp_hndl,
 		xio_set_error(XIO_E_MSG_INVALID);
 		task->status = XIO_E_MSG_INVALID;
 		break;
-	};
+	}
 
 	return 0;
 
@@ -2647,7 +2647,7 @@ static int xio_tcp_on_recv_req_data(struct xio_tcp_transport *tcp_hndl,
 	default:
 		ERROR_LOG("unexpected opcode\n");
 		break;
-	};
+	}
 
 	/* fill notification event */
 	event_data.msg.op	= XIO_WC_OP_RECV;
diff --git a/src/usr/transport/tcp/xio_tcp_management.c b/src/usr/transport/tcp/xio_tcp_management.c
@@ -2333,7 +2333,7 @@ static void init_initial_tasks_pool_ops(void)
 		xio_tcp_initial_pool_post_create;
 	initial_tasks_pool_ops.task_pre_put =
 		xio_tcp_task_pre_put;
-};
+}
 
 /*---------------------------------------------------------------------------*/
 /* xio_tcp_primary_pool_slab_pre_create					     */
@@ -2523,7 +2523,7 @@ static void init_primary_tasks_pool_ops(void)
 	primary_tasks_pool_ops.pool_post_create =
 		xio_tcp_primary_pool_post_create;
 	primary_tasks_pool_ops.task_pre_put = xio_tcp_task_pre_put;
-};
+}
 
 /*---------------------------------------------------------------------------*/
 /* xio_tcp_get_pools_ops						     */
@@ -2832,7 +2832,7 @@ static void init_single_sock_ops(void)
 	single_sock_ops.rx_data_handler = xio_tcp_rx_data_handler;
 	single_sock_ops.shutdown = xio_tcp_single_sock_shutdown;
 	single_sock_ops.close = xio_tcp_single_sock_close;
-};
+}
 
 /*---------------------------------------------------------------------------*/
 static void init_dual_sock_ops(void)
@@ -2848,7 +2848,7 @@ static void init_dual_sock_ops(void)
 	dual_sock_ops.rx_data_handler = xio_tcp_rx_data_handler;
 	dual_sock_ops.shutdown = xio_tcp_dual_sock_shutdown;
 	dual_sock_ops.close = xio_tcp_dual_sock_close;
-};
+}
 
 struct xio_transport xio_tcp_transport;
 /*---------------------------------------------------------------------------*/
diff --git a/src/usr/transport/xio_usr_transport.c b/src/usr/transport/xio_usr_transport.c
@@ -198,5 +198,5 @@ char *xio_transport_state_str(enum xio_transport_state state)
 	}
 
 	return NULL;
-};
+}
 
diff --git a/src/usr/xio/xio_context.c b/src/usr/xio/xio_context.c
@@ -786,7 +786,7 @@ int xio_ctx_pool_create(struct xio_context *ctx, enum xio_proto proto,
 		xio_set_error(EINVAL);
 		ERROR_LOG("unknown pool class\n");
 		return -1;
-	};
+	}
 
 	/* if already exist */
 	if (*tasks_pool)
diff --git a/src/usr/xio/xio_ev_loop.c b/src/usr/xio/xio_ev_loop.c
@@ -474,7 +474,7 @@ static inline int xio_ev_loop_run_helper(void *loop_hndl, int timeout)
 				 * */
 
 				/* check wakeup is armed to prevent false
-				 * wake ups
+				 * wake-ups
 				 * */
 				if (loop->wakeup_armed == 1) {
 					loop->wakeup_armed = 0;

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ static int on_session_event(struct xio_session *session,`
`150`	`150`	`break;`
`151`	`151`	`default:`
`152`	`152`	`break;`
`153`		`- };`
	`153`	`+ }`
`154`	`154`
`155`	`155`	`return 0;`
`156`	`156`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ static const char *xio_gen_status_str(enum xio_status ev)`
`129`	`129`	`return "Application resources are temporary unavailable";`
`130`	`130`	`default:`
`131`	`131`	`return "Unknown error";`
`132`		`- };`
	`132`	`+ }`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`/---------------------------------------------------------------------------/`
Original file line number	Diff line number	Diff line change
`@@ -1853,7 +1853,7 @@ const char *xio_session_event_str(enum xio_session_event event)`
`1853`	`1853`	`return "connection reconnecting";`
`1854`	`1854`	`case XIO_SESSION_CONNECTION_RECONNECTED_EVENT:`
`1855`	`1855`	`return "connection reconnected";`
`1856`		`- };`
	`1856`	`+ }`
`1857`	`1857`	`return "unknown session event";`
`1858`	`1858`	`}`
`1859`	`1859`	`EXPORT_SYMBOL(xio_session_event_str);`
Original file line number	Diff line number	Diff line change
`@@ -1002,7 +1002,6 @@ struct xio_connection xio_connect(struct xio_connection_params cparams)`
`1002`	`1002`	`}`
`1003`	`1003`	`} else if (session->state == XIO_SESSION_STATE_ONLINE \|\|`
`1004`	`1004`	`session->state == XIO_SESSION_STATE_ACCEPTED) {`
`1005`		`- struct xio_nexus *nexus;`
`1006`	`1005`	`char *portal;`
`1007`	`1006`
`1008`	`1007`	`if (cparams->conn_idx == 0) {`
Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ const char *xio_cm_rej_reason_str(int reason)`
`212`	`212`	`return "Invalid Alt Flow Label";`
`213`	`213`	`default:`
`214`	`214`	`return "Unknown error";`
`215`		`- };`
	`215`	`+ }`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`void xio_validate_ulimit_memlock(void)`