From: Bruno Haible <bruno@clisp.org>
Date: Sun, 21 Jan 2007 20:43:14 +0000 (+0000)
Subject: Update.
X-Git-Tag: v0.17~505
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e104e51cb2ec32fcc564f95f3b3ba15df990c38b;p=thirdparty%2Fgettext.git

Update.
---

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 93655db1b..35cb87764 100644
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-21  Bruno Haible  <bruno@clisp.org>
+
+	* msgl-iconv.c (convert_string, convert_msgstr, iconvable_string,
+	iconvable_msgstr): Update for changed calling convention of
+	xmem_cd_iconv.
+
 2007-01-07  Bruno Haible  <bruno@clisp.org>
 
 	* msgmerge.c (message_merge): Copy the obsolete bit from the ref
diff --git a/gettext-tools/src/msgl-iconv.c b/gettext-tools/src/msgl-iconv.c
index 83176ec08..340b82660 100644
--- a/gettext-tools/src/msgl-iconv.c
+++ b/gettext-tools/src/msgl-iconv.c
@@ -1,5 +1,5 @@
 /* Message list charset and locale charset handling.
-   Copyright (C) 2001-2003, 2005-2006 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2007 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software; you can redistribute it and/or modify
@@ -80,7 +80,7 @@ convert_string (iconv_t cd, const char *string,
 {
   size_t len = strlen (string) + 1;
   char *result = NULL;
-  size_t resultlen;
+  size_t resultlen = 0;
 
   if (xmem_cd_iconv (string, len, cd, &result, &resultlen) == 0)
     /* Verify the result has exactly one NUL byte, at the end.  */
@@ -132,7 +132,7 @@ convert_msgstr (iconv_t cd, message_ty *mp,
 		const struct conversion_context* context)
 {
   char *result = NULL;
-  size_t resultlen;
+  size_t resultlen = 0;
 
   if (!(mp->msgstr_len > 0 && mp->msgstr[mp->msgstr_len - 1] == '\0'))
     abort ();
@@ -378,7 +378,7 @@ iconvable_string (iconv_t cd, const char *string)
 {
   size_t len = strlen (string) + 1;
   char *result = NULL;
-  size_t resultlen;
+  size_t resultlen = 0;
 
   if (xmem_cd_iconv (string, len, cd, &result, &resultlen) == 0)
     {
@@ -436,7 +436,7 @@ static bool
 iconvable_msgstr (iconv_t cd, message_ty *mp)
 {
   char *result = NULL;
-  size_t resultlen;
+  size_t resultlen = 0;
 
   if (!(mp->msgstr_len > 0 && mp->msgstr[mp->msgstr_len - 1] == '\0'))
     abort ();