<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/20204">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">add osmo_use_count_to_str_c()<br><br>So far there is only osmo_use_count_name_buf(). Also provide a use count to<br>string using a talloc context, allowing to use OTC_SELECT.<br><br>- instead of foo_name(), rather use foo_to_str().<br>- osmo_use_count_name_buf() returns the buf and not the chars_needed. So add<br>  osmo_use_count_to_str_buf() with a signature that is usable by<br>  OSMO_NAME_C_IMPL().<br>- provide osmo_use_count_to_str_c() using OSMO_NAME_C_IMPL().<br><br>Change-Id: I1d2e7ee979f8c316ef99f7c65675b36d092ddfca<br>---<br>M include/osmocom/core/use_count.h<br>M src/use_count.c<br>2 files changed, 27 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/core/use_count.h b/include/osmocom/core/use_count.h</span><br><span>index a019525..cc5493c 100644</span><br><span>--- a/include/osmocom/core/use_count.h</span><br><span>+++ b/include/osmocom/core/use_count.h</span><br><span>@@ -216,6 +216,8 @@</span><br><span>                            const char *file, int line);</span><br><span> </span><br><span> const char *osmo_use_count_name_buf(char *buf, size_t buf_len, const struct osmo_use_count *uc);</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_use_count_to_str_buf(char *buf, size_t buf_len, const struct osmo_use_count *uc);</span><br><span style="color: hsl(120, 100%, 40%);">+char *osmo_use_count_to_str_c(void *ctx, const struct osmo_use_count *uc);</span><br><span> </span><br><span> int32_t osmo_use_count_total(const struct osmo_use_count *uc);</span><br><span> int32_t osmo_use_count_by(const struct osmo_use_count *uc, const char *use);</span><br><span>diff --git a/src/use_count.c b/src/use_count.c</span><br><span>index 453d2ae..738cc5d 100644</span><br><span>--- a/src/use_count.c</span><br><span>+++ b/src/use_count.c</span><br><span>@@ -107,6 +107,19 @@</span><br><span>  */</span><br><span> const char *osmo_use_count_name_buf(char *buf, size_t buf_len, const struct osmo_use_count *uc)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_use_count_to_str_buf(buf, buf_len, uc);</span><br><span style="color: hsl(120, 100%, 40%);">+  return buf;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Write a comprehensive listing of use counts to a string buffer.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Reads like "12 (3*barring,fighting,8*kungfoo)".</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[inout] buf  Destination buffer.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] buf_len  sizeof(buf).</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] uc  Use counts to print.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \return number of bytes that would be written, like snprintf().</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_use_count_to_str_buf(char *buf, size_t buf_len, const struct osmo_use_count *uc)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span>   int32_t count = osmo_use_count_total(uc);</span><br><span>    struct osmo_strbuf sb = { .buf = buf, .len = buf_len };</span><br><span>      struct osmo_use_count_entry *e;</span><br><span>@@ -128,7 +141,18 @@</span><br><span>       if (first)</span><br><span>           OSMO_STRBUF_PRINTF(sb, "-");</span><br><span>       OSMO_STRBUF_PRINTF(sb, ")");</span><br><span style="color: hsl(0, 100%, 40%);">-  return buf;</span><br><span style="color: hsl(120, 100%, 40%);">+   return sb.chars_needed;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! Write a comprehensive listing of use counts to a talloc allocated string buffer.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Reads like "12 (3*barring,fighting,8*kungfoo)".</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] ctx  talloc pool to allocate from.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] uc  Use counts to print.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \return buf, always nul-terminated.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+char *osmo_use_count_to_str_c(void *ctx, const struct osmo_use_count *uc)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_NAME_C_IMPL(ctx, 32, "ERROR", osmo_use_count_to_str_buf, uc)</span><br><span> }</span><br><span> </span><br><span> /* Return a use token's use count entry -- probably you want osmo_use_count_by() instead.</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/20204">change 20204</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/c/libosmocore/+/20204"/><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-Change-Id: I1d2e7ee979f8c316ef99f7c65675b36d092ddfca </div>
<div style="display:none"> Gerrit-Change-Number: 20204 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>