fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 04:48:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

glib-aux: fix spurious semicolon after NM_STR_BUF_INIT() macros

Browse source 
It's wrong, and it breaks certain uses.

Fixes: 13d25f9d0b ('glib-aux: add support for starting with stack-allocated buffer in NMStrBuf')
(cherry picked from commit c5ec4ebd77)
(cherry picked from commit 7b487e6951)
This commit is contained in:
Thomas Haller 2022-08-26 14:47:24 +02:00
parent 6c2c3fdfcc
commit fed6e78d05
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libnm-glib-aux/nm-str-buf.h
View file

@ -78,14 +78,14 @@ NM_STR_BUF_INIT(gsize allocated, gboolean do_bzero_mem)
? (size) \ ? (size) \
: 0, \ : 0, \
FALSE, \ FALSE, \
(do_bzero_mem)); (do_bzero_mem))
#define NM_STR_BUF_INIT_ARR(arr, do_bzero_mem) \ #define NM_STR_BUF_INIT_ARR(arr, do_bzero_mem) \
NM_STR_BUF_INIT_FULL((arr), \ NM_STR_BUF_INIT_FULL((arr), \
0, \ 0, \
NM_STATIC_ASSERT_EXPR_1(sizeof(arr) > sizeof(char *)) ? sizeof(arr) : 0, \ NM_STATIC_ASSERT_EXPR_1(sizeof(arr) > sizeof(char *)) ? sizeof(arr) : 0, \
FALSE, \ FALSE, \
(do_bzero_mem)); (do_bzero_mem))
void _nm_str_buf_ensure_size(NMStrBuf *strbuf, gsize new_size, gboolean reserve_exact); void _nm_str_buf_ensure_size(NMStrBuf *strbuf, gsize new_size, gboolean reserve_exact);