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/gsm_utils.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/gsm_utils.c')
| -rw-r--r-- | src/gsm/gsm_utils.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c index c9c15d57..f34d9ea5 100644 --- a/src/gsm/gsm_utils.c +++ b/src/gsm/gsm_utils.c @@ -886,16 +886,21 @@ uint32_t gsm_gsmtime2fn(struct gsm_time *time) return (51 * ((time->t3 - time->t2 + 26) % 26) + time->t3 + (26 * 51 * time->t1)); } -char *osmo_dump_gsmtime(const struct gsm_time *tm) +char *osmo_dump_gsmtime_buf(char *buf, size_t buf_len, const struct gsm_time *tm) { - static char buf[64]; - - snprintf(buf, sizeof(buf), "%06"PRIu32"/%02"PRIu16"/%02"PRIu8"/%02"PRIu8"/%02"PRIu8, + snprintf(buf, buf_len, "%06"PRIu32"/%02"PRIu16"/%02"PRIu8"/%02"PRIu8"/%02"PRIu8, tm->fn, tm->t1, tm->t2, tm->t3, (uint8_t)tm->fn%52); buf[sizeof(buf)-1] = '\0'; return buf; } +char *osmo_dump_gsmtime(const struct gsm_time *tm) +{ + static char buf[64]; + return osmo_dump_gsmtime_buf(buf, sizeof(buf), tm); +} + + /*! append range1024 encoded data to bit vector * \param[out] bv Caller-provided output bit-vector * \param[in] r Input Range1024 sructure */ |