widl: Strip last separator in append_namespaces if suffix is NULL.

Signed-off-by: Rémi Bernon <rbernon@codeweavers.com> Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

widl: Strip last separator in append_namespaces if suffix is NULL.
5f6fdb18 · Rémi Bernon · Alexandre Julliard · 31cbca5f · 5f6fdb18
Commit 5f6fdb18 authored Feb 26, 2021 by Rémi Bernon Committed by Alexandre Julliard Feb 26, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

typetree.c tools/widl/typetree.c +6 -1

No files found.
--- a/tools/widl/typetree.c
+++ b/tools/widl/typetree.c
@@ -124,7 +124,12 @@ static size_t append_namespaces(char **buf, size_t *len, size_t pos, struct name
    size_t n = 0;
    n += strappend(buf, len, pos + n, "%s", prefix);
    if (nested) n += append_namespace(buf, len, pos + n, namespace, separator, abi_prefix);
-    n += strappend(buf, len, pos + n, "%s", suffix);
+    if (suffix) n += strappend(buf, len, pos + n, "%s", suffix);
+    else if (nested)
+    {
+        n -= strlen(separator);
+        (*buf)[n] = 0;
+    }
    return n;
 }