[PATCH] osmo-hlr[master]: fix various compiler warnings

[Neels Hofmeyr]

Review at  https://gerrit.osmocom.org/1406

fix various compiler warnings

Change-Id: I3bf3b351535843bde9c0c1d955315615bb7c30b2
---
M src/db_auc.c
M src/gsup_server.c
M src/hlr.c
3 files changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/06/1406/1

diff --git a/src/db_auc.c b/src/db_auc.c
index 9196922..b37d9db 100644
--- a/src/db_auc.c
+++ b/src/db_auc.c
@@ -125,7 +125,7 @@
 			goto end_2g;
 		}
 #endif
-		osmo_hexparse(ki, &aud2g->u.gsm.ki, sizeof(aud2g->u.gsm.ki));
+		osmo_hexparse((void*)ki, (void*)&aud2g->u.gsm.ki, sizeof(aud2g->u.gsm.ki));
 		aud2g->type = OSMO_AUTH_TYPE_GSM;
 	} else
 		LOGAUC(imsi, LOGL_DEBUG, "No 2G Auth Data\n");
@@ -140,7 +140,7 @@
 			LOGAUC(imsi, LOGL_ERROR, "Error reading K: %d\n", rc);
 			goto out;
 		}
-		osmo_hexparse(k, &aud3g->u.umts.k, sizeof(aud3g->u.umts.k));
+		osmo_hexparse((void*)k, (void*)&aud3g->u.umts.k, sizeof(aud3g->u.umts.k));
 		/* UMTS Subscribers can have either OP or OPC */
 		op = sqlite3_column_text(stmt, 5);
 		if (!op) {
@@ -149,11 +149,11 @@
 				LOGAUC(imsi, LOGL_ERROR, "Error reading OPC: %d\n", rc);
 				goto out;
 			}
-			osmo_hexparse(opc, &aud3g->u.umts.opc,
+			osmo_hexparse((void*)opc, (void*)&aud3g->u.umts.opc,
 					sizeof(aud3g->u.umts.opc));
 			aud3g->u.umts.opc_is_op = 0;
 		} else {
-			osmo_hexparse(op, &aud3g->u.umts.opc,
+			osmo_hexparse((void*)op, (void*)&aud3g->u.umts.opc,
 					sizeof(aud3g->u.umts.opc));
 			aud3g->u.umts.opc_is_op = 1;
 		}
diff --git a/src/gsup_server.c b/src/gsup_server.c
index f95d56c..ea51f7d 100644
--- a/src/gsup_server.c
+++ b/src/gsup_server.c
@@ -51,9 +51,9 @@
 static int osmo_gsup_conn_oap_handle(struct osmo_gsup_conn *conn,
 				struct msgb *msg_rx)
 {
+#if 0
 	int rc;
 	struct msgb *msg_tx;
-#if 0
 	rc = oap_handle(&conn->oap_state, msg_rx, &msg_tx);
 	msgb_free(msg_rx);
 	if (rc < 0)
@@ -174,7 +174,7 @@
 				   struct ipaccess_unit *unit)
 {
 	struct osmo_gsup_conn *clnt = (struct osmo_gsup_conn *)conn->data;
-	uint8_t *addr;
+	uint8_t *addr = NULL;
 	size_t addr_len;
 
 	LOGP(DLGSUP, LOGL_INFO, "CCM Callback\n");
diff --git a/src/hlr.c b/src/hlr.c
index 86c5dcc..d7d97b1 100644
--- a/src/hlr.c
+++ b/src/hlr.c
@@ -182,7 +182,7 @@
 
 	memset(&gsup, 0, sizeof(gsup));
 	gsup.message_type = OSMO_GSUP_MSGT_UPDATE_LOCATION_ERROR;
-	strncpy(&gsup.imsi, luop->subscr.imsi, sizeof(gsup.imsi));
+	strncpy((char*)&gsup.imsi, luop->subscr.imsi, sizeof(gsup.imsi));
 	gsup.imsi[sizeof(gsup.imsi)-1] = '\0';
 	gsup.cause = cause;
 

-- 
To view, visit https://gerrit.osmocom.org/1406
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3bf3b351535843bde9c0c1d955315615bb7c30b2
Gerrit-PatchSet: 1
Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>