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

shared: remove "str" argument from nm_str_buf_reset()

Browse source 
NMStrBuf's API is all about convenience. When you reset the buffer,
is it convenient to immediately append a new string?

It seems not. Make nm_str_buf_reset() simpler by doing only one thing.
This commit is contained in:
Thomas Haller 2021-02-10 08:46:58 +01:00
parent 04e824a256
commit edc7c7204c
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libnm-core/nm-utils.c
View file

@ -3623,7 +3623,8 @@ nm_utils_file_search_in_paths(const char * progname,
if (!path[0])
continue;
nm_str_buf_reset(&strbuf, path);
nm_str_buf_reset(&strbuf);
nm_str_buf_append(&strbuf, path);
nm_str_buf_ensure_trailing_c(&strbuf, '/');
s = nm_str_buf_append0(&strbuf, progname);

7
shared/nm-glib-aux/nm-str-buf.h
View file

@ -292,8 +292,10 @@ nm_str_buf_append_c_len(NMStrBuf *strbuf, char ch, gsize len)
}
}
/*****************************************************************************/
static inline void
nm_str_buf_reset(NMStrBuf *strbuf, const char *str)
nm_str_buf_reset(NMStrBuf *strbuf)
{
_nm_str_buf_assert(strbuf);
@ -304,9 +306,6 @@ nm_str_buf_reset(NMStrBuf *strbuf, const char *str)
}
strbuf->_priv_len = 0;
}
if (str)
nm_str_buf_append(strbuf, str);
}
/*****************************************************************************/

2
src/core/ndisc/nm-lndp-ndisc.c
View file

@ -474,7 +474,7 @@ dns_servers_done:
gsize padding;
gsize len;
nm_str_buf_reset(&sbuf, NULL);
nm_str_buf_reset(&sbuf);
for (i = 0; i < rdata->dns_domains->len; i++) {
const NMNDiscDNSDomain *dns_domain =