<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9760">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Don't call abort() directly, always use osmo_panic()<br><br>A loooong time ago, we introduced osmo_panic() as a wrapper around<br>abort().  The advantage is, that this wrapper can be overridden, and<br>that it will also work in embedded (bare iron) targets, where the<br>abort simply translates to an infinite loop.<br><br>Change-Id: I5a70eb65952cbc329bf96eacb428b07a9da32433<br>---<br>M include/osmocom/core/utils.h<br>M src/bitvec.c<br>M src/gsm/gsm0808_utils.c<br>3 files changed, 5 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h</span><br><span>index cd22dfb..dd4461c 100644</span><br><span>--- a/include/osmocom/core/utils.h</span><br><span>+++ b/include/osmocom/core/utils.h</span><br><span>@@ -4,6 +4,7 @@</span><br><span> </span><br><span> #include <osmocom/core/backtrace.h></span><br><span> #include <osmocom/core/talloc.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/panic.h></span><br><span> </span><br><span> /*! \defgroup utils General-purpose utility functions</span><br><span>  *  @{</span><br><span>@@ -77,9 +78,7 @@</span><br><span>  */</span><br><span> #define OSMO_ASSERT(exp)    \</span><br><span>         if (!(exp)) { \</span><br><span style="color: hsl(0, 100%, 40%);">-         fprintf(stderr, "Assert failed %s %s:%d\n", #exp, __BASE_FILE__, __LINE__); \</span><br><span style="color: hsl(0, 100%, 40%);">-         osmo_generate_backtrace(); \</span><br><span style="color: hsl(0, 100%, 40%);">-            abort(); \</span><br><span style="color: hsl(120, 100%, 40%);">+            osmo_panic("Assert failed %s %s:%d\n", #exp, __BASE_FILE__, __LINE__); \</span><br><span>   }</span><br><span> </span><br><span> /*! duplicate a string using talloc and release its prior content (if any)</span><br><span>diff --git a/src/bitvec.c b/src/bitvec.c</span><br><span>index 884eb02..0f56e3e 100644</span><br><span>--- a/src/bitvec.c</span><br><span>+++ b/src/bitvec.c</span><br><span>@@ -44,6 +44,7 @@</span><br><span> </span><br><span> #include <osmocom/core/bits.h></span><br><span> #include <osmocom/core/bitvec.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/panic.h></span><br><span> </span><br><span> #define BITNUM_FROM_COMP(byte, bit)    ((byte*8)+bit)</span><br><span> </span><br><span>@@ -530,7 +531,7 @@</span><br><span>     case ONE: return '1';</span><br><span>        case L: return 'L';</span><br><span>  case H: return 'H';</span><br><span style="color: hsl(0, 100%, 40%);">-     default: abort();</span><br><span style="color: hsl(120, 100%, 40%);">+     default: osmo_panic("unexpected input in bit_value_to_char"); return 'X';</span><br><span>  }</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c</span><br><span>index 080fc95..73f0234 100644</span><br><span>--- a/src/gsm/gsm0808_utils.c</span><br><span>+++ b/src/gsm/gsm0808_utils.c</span><br><span>@@ -155,7 +155,7 @@</span><br><span>    /* See also 3GPP TS 48.008 3.2.2.103 Speech Codec List */</span><br><span>    uint8_t header = 0;</span><br><span>  uint8_t *old_tail;</span><br><span style="color: hsl(0, 100%, 40%);">-      bool type_extended;</span><br><span style="color: hsl(120, 100%, 40%);">+   bool type_extended = false;</span><br><span> </span><br><span>      /* Note: Extended codec types are codec types that require 8 instead</span><br><span>          * of 4 bit to fully specify the selected codec. In the following,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9760">change 9760</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/9760"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I5a70eb65952cbc329bf96eacb428b07a9da32433 </div>
<div style="display:none"> Gerrit-Change-Number: 9760 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>