net: ocpp: Fix multiple issues detected by clang

Fix multiple warnings detected by clang:
* implicit conversions back and forth from enumeration type
  'enum ocpp_notify_reason' to 'enum ocpp_pdu_msg'
  in ocpp_internal_handler()
* label followed by a declarations
* variable declared after one switch case and used in another
* mapping a int to uint and later using it in < 0 comparisons
  and with negative values

Signed-off-by: Alberto Escolar Piedras <[email protected]>

Author: aescolar

subsys/net/lib/ocpp/ocpp.c

@@ -239,6 +239,7 @@ static void ocpp_internal_handler(void *p1, void *p2, void *p3)
 			break;
 
 		case PDU_METER_VALUES:
+		{
 			union ocpp_io_value io;
 			sys_snode_t *node;
 			struct ocpp_session *lsh;
@@ -270,7 +271,7 @@ static void ocpp_internal_handler(void *p1, void *p2, void *p3)
 			}
 			k_mutex_unlock(&ctx->ilock);
 			break;
-
+		}
 		case PDU_HEARTBEAT:
 			ocpp_heartbeat(sh);
 			/* adjust local time with cs time ! */
@@ -286,18 +287,15 @@ static void ocpp_internal_handler(void *p1, void *p2, void *p3)
 			break;
 
 		case PDU_REMOTE_START_TRANSACTION:
-			msg.msgtype = OCPP_USR_START_CHARGING;
-			ctx->cb(msg.msgtype, &msg.usr, ctx->user_data);
+			ctx->cb(OCPP_USR_START_CHARGING, &msg.usr, ctx->user_data);
 			break;
 
 		case PDU_REMOTE_STOP_TRANSACTION:
-			msg.msgtype = OCPP_USR_STOP_CHARGING;
-			ctx->cb(msg.msgtype, &msg.usr, ctx->user_data);
+			ctx->cb(OCPP_USR_STOP_CHARGING, &msg.usr, ctx->user_data);
 			break;
 
 		case PDU_UNLOCK_CONNECTOR:
-			msg.msgtype = OCPP_USR_UNLOCK_CONNECTOR;
-			ctx->cb(msg.msgtype, &msg.usr, ctx->user_data);
+			ctx->cb(OCPP_USR_UNLOCK_CONNECTOR, &msg.usr, ctx->user_data);
 			break;
 
 		default:
@@ -345,6 +343,7 @@ static int ocpp_process_server_msg(struct ocpp_info *ctx)
 	char skey[CISTR50];
 
 	case PDU_BOOTNOTIFICATION:
+	{
 		struct boot_notif binfo;
 
 		ret = fn(ui->recv_buf, &binfo);
@@ -353,9 +352,10 @@ static int ocpp_process_server_msg(struct ocpp_info *ctx)
 			ctx->hb_sec = binfo.interval;
 		}
 		break;
-
+	}
 	case PDU_AUTHORIZE:
 	case PDU_STOP_TRANSACTION:
+	{
 		struct ocpp_idtag_info idinfo = {0};
 
 		if (sh == NULL) {
@@ -367,8 +367,10 @@ static int ocpp_process_server_msg(struct ocpp_info *ctx)
 			sh->resp_status = idinfo.auth_status;
 		}
 		break;
-
+	}
 	case PDU_START_TRANSACTION:
+	{
+		struct ocpp_idtag_info idinfo = {0};
 		if (sh == NULL) {
 			break;
 		}
@@ -379,7 +381,7 @@ static int ocpp_process_server_msg(struct ocpp_info *ctx)
 			sh->resp_status = idinfo.auth_status;
 		}
 		break;
-
+	}
 	case PDU_GET_CONFIGURATION:
 		memset(skey, 0, sizeof(skey));
 
@@ -402,6 +404,7 @@ static int ocpp_process_server_msg(struct ocpp_info *ctx)
 		break;
 
 	case PDU_CHANGE_CONFIGURATION:
+	{
 		char sval[CISTR500] = {0};
 
 		memset(skey, 0, sizeof(skey));
@@ -412,7 +415,7 @@ static int ocpp_process_server_msg(struct ocpp_info *ctx)
 
 		ocpp_change_configuration(skey, ctx, sval, uid);
 		break;
-
+	}
 	case PDU_HEARTBEAT:
 		/* todo : sync time */
 		break;
@@ -471,7 +474,7 @@ static void ocpp_wsreader(void *p1, void *p2, void *p3)
 	struct ocpp_info *ctx = p1;
 	struct ocpp_upstream_info *ui = &ctx->ui;
 	struct zsock_pollfd tcpfd;
-	uint8_t ret;
+	int ret;
 	uint8_t retry_cnt = 0;
 
 	ctx->is_cs_offline = true;