osmocom
/
libosmocore
mirror of https://gerrit.osmocom.org/libosmocore
11
0
Fork 0
Code Issues Releases Wiki Activity

gsm0808_utils: use osmo_strbuf API, drop APPEND_{THING,STR,CELL_ID_U} 

This code predates 2cbe25f4, adding osmo_strbuf API and so using its
own append-to-strbuf implementation.  Let's use the new generic API.

Change-Id: Ifdfd18eeef6a0932995063259f9f179b22e781de
This commit is contained in:
Vadim Yanitskiy 2024-01-03 18:03:28 +07:00 committed by fixeria
parent 9b1e22d8d5
commit 704d9e50fc
1 changed files with 16 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/gsm/gsm0808_utils.c
View File

@ -2075,25 +2075,12 @@ const struct value_string gsm0808_cell_id_discr_names[] = {
{ 0, NULL }
};
#define APPEND_THING(func, args...) do { \
int remain = buflen - (pos - buf); \
int l = func(pos, remain, ##args); \
if (l < 0 || l > remain) \
pos = buf + buflen; \
else \
pos += l; \
if (l > 0) \
total_len += l; \
} while(0)
#define APPEND_STR(fmt, args...) APPEND_THING(snprintf, fmt, ##args)
#define APPEND_CELL_ID_U(DISCR, U) APPEND_THING(gsm0808_cell_id_u_name, DISCR, U)
char *gsm0808_cell_id_name_buf(char *buf, size_t buflen, const struct gsm0808_cell_id *cid)
{
char *pos = buf;
int total_len = 0;
APPEND_STR("%s:", gsm0808_cell_id_discr_name(cid->id_discr));
APPEND_CELL_ID_U(cid->id_discr, &cid->id);
struct osmo_strbuf sb = { .buf = buf, .len = buflen };
OSMO_STRBUF_PRINTF(sb, "%s:", gsm0808_cell_id_discr_name(cid->id_discr));
OSMO_STRBUF_APPEND(sb, gsm0808_cell_id_u_name, cid->id_discr, &cid->id);
return buf;
}
@ -2140,30 +2127,31 @@ char *gsm0808_cell_id_name_c(const void *ctx, const struct gsm0808_cell_id *cid)
*/
int gsm0808_cell_id_list_name_buf(char *buf, size_t buflen, const struct gsm0808_cell_id_list2 *cil)
{
char *pos = buf;
int total_len = 0;
int i;
struct osmo_strbuf sb = { .buf = buf, .len = buflen };
APPEND_STR("%s[%u]", gsm0808_cell_id_discr_name(cil->id_discr), cil->id_list_len);
OSMO_STRBUF_PRINTF(sb, "%s[%u]",
gsm0808_cell_id_discr_name(cil->id_discr),
cil->id_list_len);
switch (cil->id_discr) {
case CELL_IDENT_BSS:
case CELL_IDENT_NO_CELL:
return total_len;
return sb.chars_needed;
default:
break;
}
APPEND_STR(":{");
OSMO_STRBUF_PRINTF(sb, ":{");
for (i = 0; i < cil->id_list_len; i++) {
for (unsigned int i = 0; i < cil->id_list_len; i++) {
if (i)
APPEND_STR(", ");
APPEND_CELL_ID_U(cil->id_discr, &cil->id_list[i]);
OSMO_STRBUF_PRINTF(sb, ", ");
OSMO_STRBUF_APPEND(sb, gsm0808_cell_id_u_name,
cil->id_discr, &cil->id_list[i]);
}
APPEND_STR("}");
return total_len;
OSMO_STRBUF_PRINTF(sb, "}");
return sb.chars_needed;
}
/*! Return a human-readable representation of \a cil in a static buffer.
@ -2185,9 +2173,6 @@ char *gsm0808_cell_id_list_name_c(const void *ctx, const struct gsm0808_cell_id_
return buf;
}
#undef APPEND_STR
#undef APPEND_CELL_ID_U
char *gsm0808_channel_type_name_buf(char *buf, size_t buf_len, const struct gsm0808_channel_type *ct)
{
snprintf(buf, buf_len, "ch_indctr=0x%x ch_rate_type=0x%x perm_spch=%s",