diff options
| author | Harald Welte <laforge@gnumonks.org> | 2019-03-18 18:27:00 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2019-04-03 18:03:14 +0200 |
| commit | 4a62eda225ab7f3c9556990c81a6fc5e19b5eec8 (patch) | |
| tree | 5eab6ad641d4411ff31a15a51f6d0c14bccdb6f3 /src/gsm/abis_nm.c | |
| parent | 98ed3393cdfdf35ad0bb79f454474f2b27bf3d56 (diff) | |
Add _buf() functions to bypass static string buffers
We have a number of static buffers in use in libosmo*. This means
the related functions are not usable in a thread-safe way. While
we so far don't have many multi-threaded programs in the osmocom
universe, the static buffers also prevent us from calling the same
e.g. string-ify function twice within a single printf() call.
Let's make sure there's an alternative function in all those cases,
where the user can pass in a caller-allocated buffer + size, and make
the 'classic' function with the static buffer a wrapper around that
_buf() variant.
Change-Id: Ibf85f79e93244f53b2684ff6f1095c5b41203e05
Diffstat (limited to 'src/gsm/abis_nm.c')
| -rw-r--r-- | src/gsm/abis_nm.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/gsm/abis_nm.c b/src/gsm/abis_nm.c index 49d05ba5..e25fdd03 100644 --- a/src/gsm/abis_nm.c +++ b/src/gsm/abis_nm.c @@ -928,14 +928,19 @@ enum gsm_phys_chan_config abis_nm_pchan4chcomb(uint8_t chcomb) return GSM_PCHAN_NONE; } -const char *abis_nm_dump_foh(const struct abis_om_fom_hdr *foh) +char *abis_nm_dump_foh_buf(char *buf, size_t buf_len, const struct abis_om_fom_hdr *foh) { - static char foh_buf[128]; - snprintf(foh_buf, sizeof(foh_buf), "OC=%s(%02x) INST=(%02x,%02x,%02x)", + snprintf(buf, buf_len, "OC=%s(%02x) INST=(%02x,%02x,%02x)", get_value_string(abis_nm_obj_class_names, foh->obj_class), foh->obj_class, foh->obj_inst.bts_nr, foh->obj_inst.trx_nr, foh->obj_inst.ts_nr); - return foh_buf; + return buf; +} + +const char *abis_nm_dump_foh(const struct abis_om_fom_hdr *foh) +{ + static char foh_buf[128]; + return abis_nm_dump_foh_buf(foh_buf, sizeof(foh_buf), foh); } /* this is just for compatibility reasons, it is now a macro */ |