diff options
| author | Harald Welte <laforge@gnumonks.org> | 2017-02-08 15:46:53 +0000 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2017-02-08 16:49:14 +0100 |
| commit | f12d40f4df1d42e4e1ee81607db53cb01dced80d (patch) | |
| tree | dad2b8b26c2a30d445706ace067cea1a98d548a6 | |
| parent | 6b986c24228a4cc83b22e1d8aae22b94fe36e6f2 (diff) | |
fix various compiler warnings (on FreeBSD-11.0)
FreeBSD 11.0 uses clang version 3.8.0 which spits various warnings
during libosmocore compilation. Let's clean this up a bit.
Change-Id: Ic14572e6970bd0b8916604fabf807f1608fa07e5
| -rw-r--r-- | src/ctrl/control_if.c | 2 | ||||
| -rw-r--r-- | src/gsm/abis_nm.c | 2 | ||||
| -rw-r--r-- | src/gsm/ipa.c | 1 | ||||
| -rw-r--r-- | utils/osmo-sim-test.c | 6 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/ctrl/control_if.c b/src/ctrl/control_if.c index df394867..b4afd555 100644 --- a/src/ctrl/control_if.c +++ b/src/ctrl/control_if.c @@ -131,7 +131,7 @@ int ctrl_cmd_send_trap(struct ctrl_handle *ctrl, const char *name, char *value) return -ENOMEM; cmd->id = "0"; /* It's a TRAP! */ - cmd->variable = name; + cmd->variable = (char *) name; cmd->reply = value; r = ctrl_cmd_send_to_all(ctrl, cmd); talloc_free(cmd); diff --git a/src/gsm/abis_nm.c b/src/gsm/abis_nm.c index 10aae9a7..155084ac 100644 --- a/src/gsm/abis_nm.c +++ b/src/gsm/abis_nm.c @@ -571,7 +571,7 @@ struct msgb *abis_nm_fail_evt_vrep(enum abis_nm_event_type t, return NULL; } if (len) - msgb_tl16v_put(nmsg, NM_ATT_ADD_TEXT, len, add_text); + msgb_tl16v_put(nmsg, NM_ATT_ADD_TEXT, len, (const uint8_t *) add_text); return nmsg; } diff --git a/src/gsm/ipa.c b/src/gsm/ipa.c index 6dc3ab60..f44c3284 100644 --- a/src/gsm/ipa.c +++ b/src/gsm/ipa.c @@ -28,6 +28,7 @@ #include <arpa/inet.h> #include <sys/types.h> +#include <sys/socket.h> #include <osmocom/core/msgb.h> #include <osmocom/core/talloc.h> diff --git a/utils/osmo-sim-test.c b/utils/osmo-sim-test.c index 7b79c589..d822bec4 100644 --- a/utils/osmo-sim-test.c +++ b/utils/osmo-sim-test.c @@ -37,7 +37,7 @@ static struct msgb *_select_file(struct osim_chan_hdl *st, uint8_t p1, uint8_t p const uint8_t *data, uint8_t data_len) { struct msgb *msg, *resp; - char *dst; + uint8_t *dst; msg = osim_new_apdumsg(0x00, 0xA4, p1, p2, data_len, 256); dst = msgb_put(msg, data_len); @@ -65,7 +65,7 @@ static struct msgb *select_file(struct osim_chan_hdl *st, uint16_t fid) } /* 11.1.9 */ -static int verify_pin(struct osim_chan_hdl *st, uint8_t pin_nr, uint8_t *pin) +static int verify_pin(struct osim_chan_hdl *st, uint8_t pin_nr, char *pin) { struct msgb *msg; char *pindst; @@ -75,7 +75,7 @@ static int verify_pin(struct osim_chan_hdl *st, uint8_t pin_nr, uint8_t *pin) return -EINVAL; msg = osim_new_apdumsg(0x00, 0x20, 0x00, pin_nr, 8, 0); - pindst = msgb_put(msg, 8); + pindst = (char *) msgb_put(msg, 8); memset(pindst, 0xFF, 8); strncpy(pindst, pin, strlen(pin)); |