diff options
author | Thomas Haller <thaller@redhat.com> | 2021-07-30 08:53:16 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2021-08-02 09:26:42 +0200 |
commit | d0ba87a1ad25f1cc134ef57ff154043775b4feb3 (patch) | |
tree | bf615e8ed9049e1b1eb1d8a1c9711c817960945d /src/libnm-log-core | |
parent | ce3069b01e46738847a685cbf83bc0fe170cb1b1 (diff) | |
download | NetworkManager-d0ba87a1ad25f1cc134ef57ff154043775b4feb3.tar.gz |
all: rename nm_utils_strbuf_*() API to nm_strbuf_*()
The "utils" part does not seem useful in the name.
Note that we also have NMStrBuf, which is named nm_str_buf_*().
There is an unfortunate similarity between the two, but it's still
distinct enough (in particular, because one takes an NMStrBuf and
the other not).
Diffstat (limited to 'src/libnm-log-core')
-rw-r--r-- | src/libnm-log-core/nm-logging.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/libnm-log-core/nm-logging.c b/src/libnm-log-core/nm-logging.c index aca0e02f64..43d8285cf2 100644 --- a/src/libnm-log-core/nm-logging.c +++ b/src/libnm-log-core/nm-logging.c @@ -525,16 +525,16 @@ again: buf_p = _all_logging_domains_to_str; buf_l = sizeof(_all_logging_domains_to_str); - nm_utils_strbuf_append_str(&buf_p, &buf_l, LOGD_DEFAULT_STRING); + nm_strbuf_append_str(&buf_p, &buf_l, LOGD_DEFAULT_STRING); for (diter = &domain_desc[0]; diter->name; diter++) { - nm_utils_strbuf_append_c(&buf_p, &buf_l, ','); - nm_utils_strbuf_append_str(&buf_p, &buf_l, diter->name); + nm_strbuf_append_c(&buf_p, &buf_l, ','); + nm_strbuf_append_str(&buf_p, &buf_l, diter->name); if (diter->num == LOGD_DHCP6) - nm_utils_strbuf_append_str(&buf_p, &buf_l, "," LOGD_DHCP_STRING); + nm_strbuf_append_str(&buf_p, &buf_l, "," LOGD_DHCP_STRING); else if (diter->num == LOGD_IP6) - nm_utils_strbuf_append_str(&buf_p, &buf_l, "," LOGD_IP_STRING); + nm_strbuf_append_str(&buf_p, &buf_l, "," LOGD_IP_STRING); } - nm_utils_strbuf_append_str(&buf_p, &buf_l, LOGD_ALL_STRING); + nm_strbuf_append_str(&buf_p, &buf_l, LOGD_ALL_STRING); /* Did you modify the logging domains (or their names)? Adjust the size of * _all_logging_domains_to_str buffer above to have the exact size. */ @@ -746,13 +746,13 @@ _nm_log_impl(const char *file, s_log_domains = s_log_domains_buf; l_log_domains = sizeof(s_log_domains_buf); - nm_utils_strbuf_append_str(&s_log_domains, &l_log_domains, "NM_LOG_DOMAINS="); + nm_strbuf_append_str(&s_log_domains, &l_log_domains, "NM_LOG_DOMAINS="); for (diter = &domain_desc[0]; dom_all != 0 && diter->name; diter++) { if (!NM_FLAGS_ANY(dom_all, diter->num)) continue; if (dom_all != domain) - nm_utils_strbuf_append_c(&s_log_domains, &l_log_domains, ','); - nm_utils_strbuf_append_str(&s_log_domains, &l_log_domains, diter->name); + nm_strbuf_append_c(&s_log_domains, &l_log_domains, ','); + nm_strbuf_append_str(&s_log_domains, &l_log_domains, diter->name); dom_all &= ~diter->num; } nm_assert(l_log_domains > 0); |