net: ocpp: Fix cast warning

Fix warnings generated from casting pointers
of different sizes and string literals in ocpp

Signed-off-by: Sean Kyer <[email protected]>

Author: seankyer

subsys/net/lib/ocpp/key_mgmt.c

@@ -74,11 +74,11 @@ static struct ocpp_cfg_info cached_key_cfg[OCPP_CFG_END] = {
 	FILL_KEY_TABLE(KEY_TYPE_INT,	1, CFG_MAX_ENERGYON_INVL_ID,
 			   "MaxEnergyOnInvalidId", 0),
 	FILL_KEY_TABLE(KEY_TYPE_CSL,	1, CFG_MTR_VAL_ALGIN_DATA,
-			   "MeterValuesAlignedData", (uint32_t)"0"),
+			   "MeterValuesAlignedData", .str = "0"),
 	FILL_KEY_TABLE(KEY_TYPE_INT,	0, CFG_MTR_VAL_ALGIN_DATA_MAXLEN,
 			   "MeterValuesAlignedDataMaxLength", 1),
 	FILL_KEY_TABLE(KEY_TYPE_CSL,	1, CFG_MTR_VAL_SAMPLED_DATA,
-			   "MeterValuesSampledData", (uint32_t)"0"),
+			   "MeterValuesSampledData", .str = "0"),
 	FILL_KEY_TABLE(KEY_TYPE_INT,	0, CFG_MTR_VAL_SAMPLED_DATA_MAXLEN,
 			   "MeterValuesSampledDataMaxLength", 1),
 	FILL_KEY_TABLE(KEY_TYPE_INT,	1, CFG_MTR_VAL_SAMPLE_INTERVAL,
@@ -90,20 +90,20 @@ static struct ocpp_cfg_info cached_key_cfg[OCPP_CFG_END] = {
 	FILL_KEY_TABLE(KEY_TYPE_INT,	1, CFG_REST_RETRIES,
 			   "ResetRetries", 0),
 	FILL_KEY_TABLE(KEY_TYPE_CSL,	1, CFG_CONN_PHASE_ROT,
-			   "ConnectorPhaseRotation", (uint32_t)"0"),
+			   "ConnectorPhaseRotation", .str = "0"),
 	FILL_KEY_TABLE(KEY_TYPE_INT,	0, CFG_CONN_PHASE_ROT_MAXLEN,
 			   "ConnectorPhaseRotationMaxLength", 1),
 	FILL_KEY_TABLE(KEY_TYPE_BOOL,	1, CFG_STOP_TXN_ON_EVSIDE_DISCON,
 			   "StopTransactionOnEVSideDisconnect", 0),
 	FILL_KEY_TABLE(KEY_TYPE_BOOL,	1, CFG_STOP_TXN_ON_INVL_ID,
 			   "StopTransactionOnInvalidId", 0),
 	FILL_KEY_TABLE(KEY_TYPE_CSL,	1, CFG_STOP_TXN_ALIGNED_DATA,
-			   "StopTxnAlignedData", (uint32_t)"0"),
+			   "StopTxnAlignedData", .str = "0"),
 	FILL_KEY_TABLE(KEY_TYPE_INT,	0, CFG_STOP_TXN_ALIGNED_DATA_MAXLEN,
 			   "StopTxnAlignedDataMaxLength", 1),
 	FILL_KEY_TABLE(KEY_TYPE_CSL,	0, CFG_SUPPORTED_FEATURE_PROFILE,
 			   "SupportedFeatureProfiles",
-			   (uint32_t) CP_CORE CP_SC CP_RT CP_RE CP_LAL CP_FM),
+			   .str = CP_CORE CP_SC CP_RT CP_RE CP_LAL CP_FM),
 	FILL_KEY_TABLE(KEY_TYPE_INT,	0, CFG_SUPPORTED_FEATURE_PROFILE_MAXLEN,
 			   "SupportedFeatureProfilesMaxLength", 6),
 	FILL_KEY_TABLE(KEY_TYPE_INT,	1, CFG_TXN_MSG_ATTEMPTS,

subsys/net/lib/ocpp/ocpp.c

@@ -326,7 +326,7 @@ static int ocpp_process_server_msg(struct ocpp_info *ctx)
 
 	if (is_rsp) {
 		buf = strtok_r(uid, "-", &tmp);
-		sh = (struct ocpp_session *) atoi(buf);
+		sh = (struct ocpp_session *)(uintptr_t)atoi(buf);
 
 		buf = strtok_r(NULL, "-", &tmp);
 		pdu = atoi(buf);

subsys/net/lib/ocpp/ocpp_j.c

@@ -114,7 +114,7 @@ static int frame_authorize_msg(char *buf, int len,
 	}
 
 	ret = frame_rpc_call_req(buf, len, PDU_AUTHORIZE,
-				 (uint32_t)ses, auth_obj);
+				 (uintptr_t)ses, auth_obj);
 	if (ret < 0) {
 		return ret;
 	}
@@ -128,7 +128,7 @@ static int frame_heartbeat_msg(char *buf, int len, struct ocpp_session *ses)
 	char tmp_buf[8] = "{}";
 
 	ret = frame_rpc_call_req(buf, len, PDU_HEARTBEAT,
-				 (uint32_t)ses, tmp_buf);
+				 (uintptr_t)ses, tmp_buf);
 	if (ret < 0) {
 		return ret;
 	}
@@ -212,7 +212,7 @@ static int frame_bootnotif_msg(char *buf, int len,
 	}
 
 	ret = frame_rpc_call_req(buf, len, PDU_BOOTNOTIFICATION,
-				 (uint32_t)ses, tmp_buf);
+				 (uintptr_t)ses, tmp_buf);
 	if (ret < 0) {
 		return ret;
 	}
@@ -283,7 +283,7 @@ static int frame_meter_val_msg(char *buf, int len, struct ocpp_session *ses, cha
 	}
 
 	ret = frame_rpc_call_req(buf, len, PDU_METER_VALUES,
-				 (uint32_t)ses, tmp_buf);
+				 (uintptr_t)ses, tmp_buf);
 	if (ret < 0) {
 		return ret;
 	}
@@ -334,7 +334,7 @@ static int frame_stop_txn_msg(char *buf, int len, struct ocpp_session *ses,
 	}
 
 	ret = frame_rpc_call_req(buf, len, PDU_STOP_TRANSACTION,
-				 (uint32_t)ses, tmp_buf);
+				 (uintptr_t)ses, tmp_buf);
 	if (ret < 0) {
 		return ret;
 	}
@@ -381,7 +381,7 @@ static int frame_start_txn_msg(char *buf, int len, struct ocpp_session *ses,
 	}
 
 	ret = frame_rpc_call_req(buf, len, PDU_START_TRANSACTION,
-				 (uint32_t)ses, tmp_buf);
+				 (uintptr_t)ses, tmp_buf);
 	if (ret < 0) {
 		return ret;
 	}