X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Funinorm%2Fu-normxfrm.h;h=6ed1e3c36002cd9b857eb6245edbd67add8dd5bc;hb=5709a7204dfd9a4fedf2cdbaa341bc6c540dadf3;hp=60036b10580c5c8a238afc8b7b9d00423fb6f2ab;hpb=401aeb2d65f0dc85ddf318bec7454dc403c0bf8e;p=gnulib.git

diff --git a/lib/uninorm/u-normxfrm.h b/lib/uninorm/u-normxfrm.h
index 60036b105..6ed1e3c36 100644
--- a/lib/uninorm/u-normxfrm.h
+++ b/lib/uninorm/u-normxfrm.h
@@ -25,7 +25,6 @@ FUNC (const UNIT *s, size_t n, uninorm_t nf,
   char convsbuf[2048];
   char *convs;
   size_t convs_length;
-  int ret;
   char *result;
 
   /* Normalize the Unicode string.  */
@@ -36,14 +35,13 @@ FUNC (const UNIT *s, size_t n, uninorm_t nf,
     return NULL;
 
   /* Convert it to locale encoding.  */
-  convs = convsbuf;
   convs_length = sizeof (convsbuf) - 1;
-  ret = U_CONV_TO_ENCODING (locale_charset (),
-			    iconveh_error,
-			    norms, norms_length,
-			    NULL,
-			    &convs, &convs_length);
-  if (ret < 0)
+  convs = U_CONV_TO_ENCODING (locale_charset (),
+			      iconveh_error,
+			      norms, norms_length,
+			      NULL,
+			      convsbuf, &convs_length);
+  if (convs == NULL)
     {
       if (norms != normsbuf)
 	{