Rename archive_wstrappend_mbs to archive_wstrcpy_mbs to better reflect what it actual...

SVN-Revision: 2818

diff --git a/libarchive/archive_string.c b/libarchive/archive_string.c
index 72edd663814ccb5672f86e3d4fe3a522fa9970a6..e73c7512bbf44e0f6fab50bdf5ba7de1e7a33b20 100644 (file)
--- 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 e9bc7116a6ffb11d613b4c55c1c3fd3a57ff8b04..6250ecf23e5d37eaae743d723f138ac185fa1370 100644 (file)
--- 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);