<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13994">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;">talloc: \n -> \r\n for serial output<br><br>Change-Id: Ieeb6a93c2dc9578220c73771136e2df7476f5e45<br>---<br>M sysmoOCTSIM/talloc.c<br>1 file changed, 17 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/sysmoOCTSIM/talloc.c b/sysmoOCTSIM/talloc.c</span><br><span>index 54be634..c5c9062 100644</span><br><span>--- a/sysmoOCTSIM/talloc.c</span><br><span>+++ b/sysmoOCTSIM/talloc.c</span><br><span>@@ -494,7 +494,7 @@</span><br><span> </span><br><span> static void talloc_abort(const char *reason)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_log("%s\n", reason);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_log("%s\r\n", reason);</span><br><span> </span><br><span> if (!talloc_abort_fn) {</span><br><span> TALLOC_ABORT(reason);</span><br><span>@@ -521,7 +521,7 @@</span><br><span> if (unlikely((tc->flags & (TALLOC_FLAG_FREE | ~TALLOC_FLAG_MASK)) != talloc_magic)) {</span><br><span> if ((tc->flags & (TALLOC_FLAG_FREE | ~TALLOC_FLAG_MASK))</span><br><span> == (TALLOC_MAGIC_NON_RANDOM | TALLOC_FLAG_FREE)) {</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_log("talloc: access after free error - first free may be at %s\n", tc->name);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_log("talloc: access after free error - first free may be at %s\r\n", tc->name);</span><br><span> talloc_abort_access_after_free();</span><br><span> return NULL;</span><br><span> }</span><br><span>@@ -1331,11 +1331,11 @@</span><br><span> if (unlikely(tc->refs != NULL) && talloc_parent(ptr) != new_ctx) {</span><br><span> struct talloc_reference_handle *h;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- talloc_log("WARNING: talloc_steal with references at %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_log("WARNING: talloc_steal with references at %s\r\n",</span><br><span> location);</span><br><span> </span><br><span> for (h=tc->refs; h; h=h->next) {</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_log("\treference at %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_log("\treference at %s\r\n",</span><br><span> h->location);</span><br><span> }</span><br><span> }</span><br><span>@@ -1344,7 +1344,7 @@</span><br><span> /* this test is probably too expensive to have on in the</span><br><span> normal build, but it useful for debugging */</span><br><span> if (talloc_is_parent(new_ctx, ptr)) {</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_log("WARNING: stealing into talloc child at %s\n", location);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_log("WARNING: stealing into talloc child at %s\r\n", location);</span><br><span> }</span><br><span> #endif</span><br><span> </span><br><span>@@ -1756,11 +1756,11 @@</span><br><span> return talloc_unlink(null_context, ptr);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- talloc_log("ERROR: talloc_free with references at %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_log("ERROR: talloc_free with references at %s\r\n",</span><br><span> location);</span><br><span> </span><br><span> for (h=tc->refs; h; h=h->next) {</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_log("\treference at %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_log("\treference at %s\r\n",</span><br><span> h->location);</span><br><span> }</span><br><span> return -1;</span><br><span>@@ -2251,14 +2251,14 @@</span><br><span> FILE *f = (FILE *)_f;</span><br><span> </span><br><span> if (is_ref) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(f, "%*sreference to: %s\n", depth*4, "", name);</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(f, "%*sreference to: %s\r\n", depth*4, "", name);</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span> tc = talloc_chunk_from_ptr(ptr);</span><br><span> if (tc->limit && tc->limit->parent == tc) {</span><br><span> fprintf(f, "%*s%-30s is a memlimit context"</span><br><span style="color: hsl(0, 100%, 40%);">- " (max_size = %lu bytes, cur_size = %lu bytes)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ " (max_size = %lu bytes, cur_size = %lu bytes)\r\n",</span><br><span> depth*4, "",</span><br><span> name,</span><br><span> (unsigned long)tc->limit->max_size,</span><br><span>@@ -2266,14 +2266,14 @@</span><br><span> }</span><br><span> </span><br><span> if (depth == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(f,"%stalloc report on '%s' (total %6lu bytes in %3lu blocks)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(f,"%stalloc report on '%s' (total %6lu bytes in %3lu blocks)\r",</span><br><span> (max_depth < 0 ? "full " :""), name,</span><br><span> (unsigned long)talloc_total_size(ptr),</span><br><span> (unsigned long)talloc_total_blocks(ptr));</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(f, "%*s%-30s contains %6lu bytes in %3lu blocks (ref %d) %p\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(f, "%*s%-30s contains %6lu bytes in %3lu blocks (ref %d) %p\r\n",</span><br><span> depth*4, "",</span><br><span> name,</span><br><span> (unsigned long)talloc_total_size(ptr),</span><br><span>@@ -2294,7 +2294,7 @@</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(f, "\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(f, "\r\n");</span><br><span> #endif</span><br><span> }</span><br><span> </span><br><span>@@ -2837,14 +2837,14 @@</span><br><span> struct talloc_chunk *tc;</span><br><span> </span><br><span> if (context == NULL) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(file, "talloc no parents for NULL\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(file, "talloc no parents for NULL\r\n");</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span> tc = talloc_chunk_from_ptr(context);</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(file, "talloc parents of '%s'\n", __talloc_get_name(context));</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(file, "talloc parents of '%s'\r\n", __talloc_get_name(context));</span><br><span> while (tc) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(file, "\t'%s'\n", __talloc_get_name(TC_PTR_FROM_CHUNK(tc)));</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(file, "\t'%s'\r\n", __talloc_get_name(TC_PTR_FROM_CHUNK(tc)));</span><br><span> while (tc && tc->prev) tc = tc->prev;</span><br><span> if (tc) {</span><br><span> tc = tc->parent;</span><br><span>@@ -2971,7 +2971,7 @@</span><br><span> for (l = limit; l != NULL; l = l->upper) {</span><br><span> size_t new_cur_size = l->cur_size + size;</span><br><span> if (new_cur_size < l->cur_size) {</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_abort("logic error in talloc_memlimit_grow\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_abort("logic error in talloc_memlimit_grow\r\n");</span><br><span> return;</span><br><span> }</span><br><span> l->cur_size = new_cur_size;</span><br><span>@@ -2988,7 +2988,7 @@</span><br><span> </span><br><span> for (l = limit; l != NULL; l = l->upper) {</span><br><span> if (l->cur_size < size) {</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_abort("logic error in talloc_memlimit_shrink\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_abort("logic error in talloc_memlimit_shrink\r\n");</span><br><span> return;</span><br><span> }</span><br><span> l->cur_size = l->cur_size - size;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13994">change 13994</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/13994"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ccid-firmware </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ieeb6a93c2dc9578220c73771136e2df7476f5e45 </div>
<div style="display:none"> Gerrit-Change-Number: 13994 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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 (1000002) </div>