From 459a180877d410d491d7adb1fdf9cc12fd51ac99 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Thu, 28 Jun 2018 09:24:17 +0200 Subject: Don't call abort() directly, always use osmo_panic() A loooong time ago, we introduced osmo_panic() as a wrapper around abort(). The advantage is, that this wrapper can be overridden, and that it will also work in embedded (bare iron) targets, where the abort simply translates to an infinite loop. Change-Id: I5a70eb65952cbc329bf96eacb428b07a9da32433 --- src/bitvec.c | 3 ++- src/gsm/gsm0808_utils.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/bitvec.c b/src/bitvec.c index 884eb025..0f56e3e9 100644 --- a/src/bitvec.c +++ b/src/bitvec.c @@ -44,6 +44,7 @@ #include #include +#include #define BITNUM_FROM_COMP(byte, bit) ((byte*8)+bit) @@ -530,7 +531,7 @@ char bit_value_to_char(enum bit_value v) case ONE: return '1'; case L: return 'L'; case H: return 'H'; - default: abort(); + default: osmo_panic("unexpected input in bit_value_to_char"); return 'X'; } } diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 080fc95b..73f02341 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -155,7 +155,7 @@ static uint8_t enc_speech_codec(struct msgb *msg, /* See also 3GPP TS 48.008 3.2.2.103 Speech Codec List */ uint8_t header = 0; uint8_t *old_tail; - bool type_extended; + bool type_extended = false; /* Note: Extended codec types are codec types that require 8 instead * of 4 bit to fully specify the selected codec. In the following, -- cgit v1.2.3