summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2022-03-17 12:28:15 +0100
committerThomas Haller <thaller@redhat.com>2022-03-17 12:28:56 +0100
commit47519659edaad1e3205f4055e3e270b12144d3bc (patch)
treeb4deeca874d813f3e3ee26c420c6ebfee56c7ada
parentca9c67565a710eb6b371bc72da266014225a3e3f (diff)
glib-aux: reword code comments for nm_utils_buf_utf8safe_{,un}escape()
-rw-r--r--src/libnm-glib-aux/nm-shared-utils.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/libnm-glib-aux/nm-shared-utils.c b/src/libnm-glib-aux/nm-shared-utils.c
index f059741e23..3b5bc6f92b 100644
--- a/src/libnm-glib-aux/nm-shared-utils.c
+++ b/src/libnm-glib-aux/nm-shared-utils.c
@@ -2960,8 +2960,8 @@ _str_buf_append_c_escape_octal(NMStrBuf *strbuf, char ch)
*
* Returns: the unescaped buffer of length @out_len. If @str is %NULL, this returns %NULL
* and sets @out_len to 0. Otherwise, a non-%NULL binary buffer is returned with
- * @out_len bytes. Note that the binary buffer is guaranteed to be NUL terminated. That
- * is @result[@out_len] is NUL.
+ * @out_len bytes. Note that the binary buffer is guaranteed to be NUL terminated
+ * (@result[@out_len] is NUL).
* Note that the result is binary, and may have embedded NUL characters and non-UTF-8.
* If the function can avoid cloning the input string, it will return a pointer inside
* the input @str. For example, if there is no backslash, no cloning is necessary. In that
@@ -3123,11 +3123,14 @@ nm_utils_buf_utf8safe_unescape(const char *str,
* invalid UTF-8 sequences, and other (depending on @flags).
*
* Returns: the escaped input buffer, as valid UTF-8. If no escaping
- * is necessary, it returns the input @buf. Otherwise, an allocated
- * string @to_free is returned which must be freed by the caller
- * with g_free. The escaping can be reverted by g_strcompress().
- * There are cases where this function can return NULL:
- * - if @buflen is 0
+ * is necessary and @buflen is negative, it returns the input @buf
+ * that can be interpreted as NUL terminated UTF-8 string.
+ * Otherwise, an allocated string @to_free is returned which must be freed
+ * by the caller with g_free().
+ * The escaping can be reverted by nm_utils_buf_utf8safe_unescape()
+ * (or, if in the absence of NUL characters, with g_strcompress()).
+ * There are cases where this function returns %NULL:
+ * - if @buflen is 0.
* - if @buflen is negative and @buf is NULL.
**/
const char *