aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2021-09-14 14:39:18 +0200
committerneels <nhofmeyr@sysmocom.de>2021-09-20 13:04:54 +0000
commit049fd5ccc0f70f60b6f076c7e4594740e4f727b6 (patch)
tree6d438d8dee10fe0f254421df12101e203aa405a7 /src
parentb48f438ae9f3cd80b3f858db4620ea8f4a7dca37 (diff)
stat_item: cosmetic: s/desc/group_desc in osmo_stat_item_group_alloc()
There also is an osmo_stat_item_desc, so the name 'desc' makes it hard to read the code / the upcoming refactoring patches. It is an osmo_stat_item_group_desc, so call it group_desc. Related: SYS#5542 Change-Id: I07bc011450549a44ebf043e7d8a70718ddfd900e
Diffstat (limited to 'src')
-rw-r--r--src/stat_item.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/stat_item.c b/src/stat_item.c
index 87cbfea7..17887464 100644
--- a/src/stat_item.c
+++ b/src/stat_item.c
@@ -94,7 +94,7 @@ static void *tall_stat_item_ctx;
* \param[in] idx Index of new stat item group
*/
struct osmo_stat_item_group *osmo_stat_item_group_alloc(void *ctx,
- const struct osmo_stat_item_group_desc *desc,
+ const struct osmo_stat_item_group_desc *group_desc,
unsigned int idx)
{
unsigned int group_size;
@@ -105,7 +105,7 @@ struct osmo_stat_item_group *osmo_stat_item_group_alloc(void *ctx,
struct osmo_stat_item_group *group;
group_size = sizeof(struct osmo_stat_item_group) +
- desc->num_items * sizeof(struct osmo_stat_item *);
+ group_desc->num_items * sizeof(struct osmo_stat_item *);
if (!ctx)
ctx = tall_stat_item_ctx;
@@ -114,15 +114,15 @@ struct osmo_stat_item_group *osmo_stat_item_group_alloc(void *ctx,
if (!group)
return NULL;
- group->desc = desc;
+ group->desc = group_desc;
group->idx = idx;
/* Get combined size of all items */
- for (item_idx = 0; item_idx < desc->num_items; item_idx++) {
+ for (item_idx = 0; item_idx < group_desc->num_items; item_idx++) {
unsigned int size;
size = sizeof(struct osmo_stat_item) +
sizeof(struct osmo_stat_item_value) *
- desc->item_desc[item_idx].num_values;
+ group_desc->item_desc[item_idx].num_values;
/* Align to pointer size */
size = (size + sizeof(void *) - 1) & ~(sizeof(void *) - 1);
@@ -139,18 +139,18 @@ struct osmo_stat_item_group *osmo_stat_item_group_alloc(void *ctx,
}
/* Update item pointers */
- for (item_idx = 0; item_idx < desc->num_items; item_idx++) {
+ for (item_idx = 0; item_idx < group_desc->num_items; item_idx++) {
struct osmo_stat_item *item = (struct osmo_stat_item *)
((uint8_t *)items + (unsigned long)group->items[item_idx]);
unsigned int i;
group->items[item_idx] = item;
- item->last_offs = desc->item_desc[item_idx].num_values - 1;
+ item->last_offs = group_desc->item_desc[item_idx].num_values - 1;
item->stats_next_id = 1;
- item->desc = &desc->item_desc[item_idx];
+ item->desc = &group_desc->item_desc[item_idx];
for (i = 0; i <= item->last_offs; i++) {
- item->values[i].value = desc->item_desc[item_idx].default_value;
+ item->values[i].value = group_desc->item_desc[item_idx].default_value;
item->values[i].id = OSMO_STAT_ITEM_NOVALUE_ID;
}
}