From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Mon, 16 May 2011 03:44:15 +0000 (-0400)
Subject: Fix the return code of archive_string_append_from_wcs_in_codepage().
X-Git-Tag: v3.0.0a~349
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63b1f4efeeee5b858f29cd778771e354026a915f;p=thirdparty%2Flibarchive.git

Fix the return code of archive_string_append_from_wcs_in_codepage().

SVN-Revision: 3338
---

diff --git a/libarchive/archive_string.c b/libarchive/archive_string.c
index abd1803ec..cacdcded4 100644
--- a/libarchive/archive_string.c
+++ b/libarchive/archive_string.c
@@ -635,7 +635,7 @@ archive_string_append_from_wcs_in_codepage(struct archive_string *as,
 	}
 	as->length += count;
 	as->s[as->length] = '\0';
-	return (defchar_used?-1:0);
+	return (defchar_used?-1:ret);
 }
 
 #elif defined(HAVE_WCSNRTOMBS)