diff options
author | Pablo Neira Ayuso <pablo@gnumonks.org> | 2011-05-07 12:43:08 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@gnumonks.org> | 2011-05-07 13:00:51 +0200 |
commit | 87f7b25e563ed3a3a33bb8c5d5a4543c3d5ca706 (patch) | |
tree | cf222ce589d0daed5343c9f4f3a817f173bfb83e /include/osmocom | |
parent | 220abab3fa037e49188cc655084a26d3c3c44fd4 (diff) |
utils: use namespace prefix osmo_*
Summary of changes:
s/bcd2char/osmo_bcd2char/g
s/char2bcd/osmo_char2bcd/g
s/hexparse/osmo_hexparse/g
s/hexdump/osmo_hexdump/g
s/hexdump_nospc/osmo_hexdump_nospc/g
s/ubit_dump/osmo_ubit_dump/g
s/static_assert/osmo_static_assert/g
Diffstat (limited to 'include/osmocom')
-rw-r--r-- | include/osmocom/core/msgb.h | 2 | ||||
-rw-r--r-- | include/osmocom/core/utils.h | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/osmocom/core/msgb.h b/include/osmocom/core/msgb.h index 57b5d7f4..8665c2bf 100644 --- a/include/osmocom/core/msgb.h +++ b/include/osmocom/core/msgb.h @@ -181,7 +181,7 @@ static inline void msgb_reserve(struct msgb *msg, int len) static inline struct msgb *msgb_alloc_headroom(int size, int headroom, const char *name) { - static_assert(size > headroom, headroom_bigger); + osmo_static_assert(size > headroom, headroom_bigger); struct msgb *msg = msgb_alloc(size, name); if (msg) diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h index 252228de..0f1ea3bb 100644 --- a/include/osmocom/core/utils.h +++ b/include/osmocom/core/utils.h @@ -13,16 +13,16 @@ struct value_string { const char *get_value_string(const struct value_string *vs, uint32_t val); int get_string_value(const struct value_string *vs, const char *str); -char bcd2char(uint8_t bcd); +char osmo_bcd2char(uint8_t bcd); /* only works for numbers in ascci */ -uint8_t char2bcd(char c); +uint8_t osmo_char2bcd(char c); -int hexparse(const char *str, uint8_t *b, int max_len); -char *hexdump(const unsigned char *buf, int len); -char *hexdump_nospc(const unsigned char *buf, int len); -char *ubit_dump(const uint8_t *bits, unsigned int len); +int osmo_hexparse(const char *str, uint8_t *b, int max_len); +char *osmo_hexdump(const unsigned char *buf, int len); +char *osmo_osmo_hexdump_nospc(const unsigned char *buf, int len); +char *osmo_ubit_dump(const uint8_t *bits, unsigned int len); -#define static_assert(exp, name) typedef int dummy##name [(exp) ? 1 : -1]; +#define osmo_static_assert(exp, name) typedef int dummy##name [(exp) ? 1 : -1]; void osmo_str2lower(char *out, const char *in); void osmo_str2upper(char *out, const char *in); |