<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/25461">View Change</a></p><div style="white-space:pre-wrap">Approvals:
fixeria: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">stat_item: cosmetic: s/desc/group_desc in osmo_stat_item_group_alloc()<br><br>There also is an osmo_stat_item_desc, so the name 'desc' makes it hard<br>to read the code / the upcoming refactoring patches. It is an<br>osmo_stat_item_group_desc, so call it group_desc.<br><br>Related: SYS#5542<br>Change-Id: I07bc011450549a44ebf043e7d8a70718ddfd900e<br>---<br>M include/osmocom/core/stat_item.h<br>M src/stat_item.c<br>2 files changed, 10 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/core/stat_item.h b/include/osmocom/core/stat_item.h</span><br><span>index 402a7ae..e600ecd 100644</span><br><span>--- a/include/osmocom/core/stat_item.h</span><br><span>+++ b/include/osmocom/core/stat_item.h</span><br><span>@@ -77,7 +77,7 @@</span><br><span> </span><br><span> struct osmo_stat_item_group *osmo_stat_item_group_alloc(</span><br><span> void *ctx,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_stat_item_group_desc *desc,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_stat_item_group_desc *group_desc,</span><br><span> unsigned int idx);</span><br><span> </span><br><span> static inline void osmo_stat_item_group_udp_idx(</span><br><span>diff --git a/src/stat_item.c b/src/stat_item.c</span><br><span>index 87cbfea..1788746 100644</span><br><span>--- a/src/stat_item.c</span><br><span>+++ b/src/stat_item.c</span><br><span>@@ -94,7 +94,7 @@</span><br><span> * \param[in] idx Index of new stat item group</span><br><span> */</span><br><span> struct osmo_stat_item_group *osmo_stat_item_group_alloc(void *ctx,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_stat_item_group_desc *desc,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_stat_item_group_desc *group_desc,</span><br><span> unsigned int idx)</span><br><span> {</span><br><span> unsigned int group_size;</span><br><span>@@ -105,7 +105,7 @@</span><br><span> struct osmo_stat_item_group *group;</span><br><span> </span><br><span> group_size = sizeof(struct osmo_stat_item_group) +</span><br><span style="color: hsl(0, 100%, 40%);">- desc->num_items * sizeof(struct osmo_stat_item *);</span><br><span style="color: hsl(120, 100%, 40%);">+ group_desc->num_items * sizeof(struct osmo_stat_item *);</span><br><span> </span><br><span> if (!ctx)</span><br><span> ctx = tall_stat_item_ctx;</span><br><span>@@ -114,15 +114,15 @@</span><br><span> if (!group)</span><br><span> return NULL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- group->desc = desc;</span><br><span style="color: hsl(120, 100%, 40%);">+ group->desc = group_desc;</span><br><span> group->idx = idx;</span><br><span> </span><br><span> /* Get combined size of all items */</span><br><span style="color: hsl(0, 100%, 40%);">- for (item_idx = 0; item_idx < desc->num_items; item_idx++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (item_idx = 0; item_idx < group_desc->num_items; item_idx++) {</span><br><span> unsigned int size;</span><br><span> size = sizeof(struct osmo_stat_item) +</span><br><span> sizeof(struct osmo_stat_item_value) *</span><br><span style="color: hsl(0, 100%, 40%);">- desc->item_desc[item_idx].num_values;</span><br><span style="color: hsl(120, 100%, 40%);">+ group_desc->item_desc[item_idx].num_values;</span><br><span> /* Align to pointer size */</span><br><span> size = (size + sizeof(void *) - 1) & ~(sizeof(void *) - 1);</span><br><span> </span><br><span>@@ -139,18 +139,18 @@</span><br><span> }</span><br><span> </span><br><span> /* Update item pointers */</span><br><span style="color: hsl(0, 100%, 40%);">- for (item_idx = 0; item_idx < desc->num_items; item_idx++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (item_idx = 0; item_idx < group_desc->num_items; item_idx++) {</span><br><span> struct osmo_stat_item *item = (struct osmo_stat_item *)</span><br><span> ((uint8_t *)items + (unsigned long)group->items[item_idx]);</span><br><span> unsigned int i;</span><br><span> </span><br><span> group->items[item_idx] = item;</span><br><span style="color: hsl(0, 100%, 40%);">- item->last_offs = desc->item_desc[item_idx].num_values - 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ item->last_offs = group_desc->item_desc[item_idx].num_values - 1;</span><br><span> item->stats_next_id = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- item->desc = &desc->item_desc[item_idx];</span><br><span style="color: hsl(120, 100%, 40%);">+ item->desc = &group_desc->item_desc[item_idx];</span><br><span> </span><br><span> for (i = 0; i <= item->last_offs; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- item->values[i].value = desc->item_desc[item_idx].default_value;</span><br><span style="color: hsl(120, 100%, 40%);">+ item->values[i].value = group_desc->item_desc[item_idx].default_value;</span><br><span> item->values[i].id = OSMO_STAT_ITEM_NOVALUE_ID;</span><br><span> }</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/25461">change 25461</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/+/25461"/><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: I07bc011450549a44ebf043e7d8a70718ddfd900e </div>
<div style="display:none"> Gerrit-Change-Number: 25461 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>