String handling: refactor the expanding-string routines and users to use a descriptor...

[exim.git] / src / src / utf8.c

diff --git a/src/src/utf8.c b/src/src/utf8.c
index 4647785b9da36fdb2492c15618568e85bf60cf91..dcc944af93516ffb90e4f797f092609d7776a027 100644 (file)
--- a/src/src/utf8.c
+++ b/src/src/utf8.c
@@ -97,8 +97,7 @@ string_domain_alabel_to_utf8(const uschar * alabel, uschar ** err)
 #ifdef SUPPORT_I18N_2008
 const uschar * label;
 int sep = '.';
-uschar * s = NULL;
-int size = 0, len = 0;
+gstring * g = NULL;
 
 while (label = string_nextinlist(&alabel, &sep, NULL, 0))
   if (  string_is_alabel(label)
@@ -106,8 +105,8 @@ while (label = string_nextinlist(&alabel, &sep, NULL, 0))
      )
     return NULL;
   else
-    s = string_append_listele(s, &size, &len, '.', label);
-return s;
+    g = string_append_listele(g, '.', label);
+return string_from_gstring(g);
 
 #else