From: Tim Kientzle Date: Tue, 7 Dec 2010 05:19:50 +0000 (-0500) Subject: Rename archive_wstrappend_mbs to archive_wstrcpy_mbs to better reflect what it actual... X-Git-Tag: v3.0.0a~825 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fe72cdc2106764bb71e1d458f6b57d589f14c1a;p=thirdparty%2Flibarchive.git Rename archive_wstrappend_mbs to archive_wstrcpy_mbs to better reflect what it actually does. SVN-Revision: 2818 --- diff --git a/libarchive/archive_string.c b/libarchive/archive_string.c index 72edd6638..e73c7512b 100644 --- a/libarchive/archive_string.c +++ b/libarchive/archive_string.c @@ -414,7 +414,7 @@ archive_wstrappend_utf8(struct archive_wstring *dest, struct archive_string *src int -archive_wstrappend_mbs(struct archive_wstring *dest, +archive_wstrcpy_mbs(struct archive_wstring *dest, struct archive_string *src) { size_t r; @@ -600,7 +600,7 @@ archive_mstring_get_wcs(struct archive_mstring *aes) } /* Try converting MBS to WCS using native locale. */ if ((aes->aes_set & AES_SET_MBS) - && !archive_wstrappend_mbs(&(aes->aes_wcs), &(aes->aes_mbs))) { + && !archive_wstrcpy_mbs(&(aes->aes_wcs), &(aes->aes_mbs))) { aes->aes_set |= AES_SET_WCS; return (aes->aes_wcs.s); } diff --git a/libarchive/archive_string.h b/libarchive/archive_string.h index e9bc7116a..6250ecf23 100644 --- a/libarchive/archive_string.h +++ b/libarchive/archive_string.h @@ -155,7 +155,7 @@ int archive_wstrappend_utf8(struct archive_wstring *dest, /* Translates from MBS in src to Unicode in dest. */ /* Returns non-zero if conversion failed in any way. */ -int archive_wstrappend_mbs(struct archive_wstring *dest, +int archive_wstrcpy_mbs(struct archive_wstring *dest, struct archive_string *src);