diff options
| author | Michihiro NAKAJIMA <ggcueroad@gmail.com> | 2012-03-16 16:08:26 +0900 |
|---|---|---|
| committer | Michihiro NAKAJIMA <ggcueroad@gmail.com> | 2012-03-17 15:28:51 +0900 |
| commit | eb54aceea1bd462863f51ce43583cb950b1b3b68 (patch) | |
| tree | e591ea3f923e26077992a7b22957795d133e4af3 /libarchive/archive_string.h | |
| parent | 0959733f8c330315e041172407c6874980debea4 (diff) | |
| download | libarchive-eb54aceea1bd462863f51ce43583cb950b1b3b68.tar.gz | |
Rename some internal functions as other related functions.
archive_strcpy_in_locale ==> archive_strcpy_l
archive_strncpy_in_locale ==> archive_strncpy_l
archive_strncat_in_locale ==> archive_strncat_l
Diffstat (limited to 'libarchive/archive_string.h')
| -rw-r--r-- | libarchive/archive_string.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libarchive/archive_string.h b/libarchive/archive_string.h index a5c0436f..23f49165 100644 --- a/libarchive/archive_string.h +++ b/libarchive/archive_string.h @@ -117,13 +117,13 @@ archive_string_conversion_set_opt(struct archive_string_conv *, int); /* Copy one archive_string to another in locale conversion. * Return -1 if conversion failes. */ int -archive_strncpy_in_locale(struct archive_string *, const void *, size_t, +archive_strncpy_l(struct archive_string *, const void *, size_t, struct archive_string_conv *); /* Copy one archive_string to another in locale conversion. * Return -1 if conversion failes. */ int -archive_strncat_in_locale(struct archive_string *, const void *, size_t, +archive_strncat_l(struct archive_string *, const void *, size_t, struct archive_string_conv *); @@ -164,8 +164,8 @@ archive_wstrcat(struct archive_wstring *, const wchar_t *); archive_strncpy((as), (p), ((p) == NULL ? 0 : strlen(p))) #define archive_wstrcpy(as,p) \ archive_wstrncpy((as), (p), ((p) == NULL ? 0 : wcslen(p))) -#define archive_strcpy_in_locale(as,p,lo) \ - archive_strncpy_in_locale((as), (p), ((p) == NULL ? 0 : strlen(p)), (lo)) +#define archive_strcpy_l(as,p,lo) \ + archive_strncpy_l((as), (p), ((p) == NULL ? 0 : strlen(p)), (lo)) /* Copy a C string to an archive_string with limit, resizing as necessary. */ #define archive_strncpy(as,p,l) \ |