summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2015-01-01 12:41:17 +0100
committerHarald Welte <laforge@gnumonks.org>2015-01-01 12:41:39 +0100
commit5468f768618c5d225e99f3ecf00c0ad068b1500b (patch)
treec742e0fb890c66caa94e008428551df97e93a704
parent7b1d25a11e44bbc1cb0d2acd9f1a3d4a16ec7c90 (diff)
convert away from deprecated gsm_7bit_{encode,decode}() functions
which removes yet another bunch of compiler warnings.
-rw-r--r--openbsc/src/libmsc/gsm_04_08.c4
-rw-r--r--openbsc/src/libmsc/gsm_04_11.c3
2 files changed, 4 insertions, 3 deletions
diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c
index ac1e9169e..ce87ca025 100644
--- a/openbsc/src/libmsc/gsm_04_08.c
+++ b/openbsc/src/libmsc/gsm_04_08.c
@@ -720,7 +720,7 @@ int gsm48_tx_mm_info(struct gsm_subscriber_connection *conn)
ptr8[2] = 0x80 | name_pad; /* Cell Broadcast DCS, no CI */
ptr8 = msgb_put(msg, name_len);
- gsm_7bit_encode(ptr8, net->name_long);
+ gsm_7bit_encode_n(ptr8, name_len, net->name_long, NULL);
}
@@ -748,7 +748,7 @@ int gsm48_tx_mm_info(struct gsm_subscriber_connection *conn)
ptr8[2] = 0x80 | name_pad; /* Cell Broadcast DCS, no CI */
ptr8 = msgb_put(msg, name_len);
- gsm_7bit_encode(ptr8, net->name_short);
+ gsm_7bit_encode_n(ptr8, name_len, net->name_short, NULL);
}
diff --git a/openbsc/src/libmsc/gsm_04_11.c b/openbsc/src/libmsc/gsm_04_11.c
index 9941e6b2a..bcc25e4c2 100644
--- a/openbsc/src/libmsc/gsm_04_11.c
+++ b/openbsc/src/libmsc/gsm_04_11.c
@@ -366,7 +366,8 @@ static int gsm340_rx_tpdu(struct gsm_subscriber_connection *conn, struct msgb *m
switch (sms_alphabet) {
case DCS_7BIT_DEFAULT:
- gsm_7bit_decode(gsms->text, smsp, gsms->user_data_len);
+ gsm_7bit_decode_n(gsms->text, sizeof(gsms->text), smsp,
+ gsms->user_data_len);
break;
case DCS_8BIT_DATA:
case DCS_UCS2: