diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2012-07-27 08:24:12 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2012-07-27 08:24:12 +0000 |
| commit | 81418b36c02b6434acd4b8ae4cfb8c80a3742fd4 (patch) | |
| tree | 4b551422581ae9a8093415e07c619e2a59ef6a7b /libarchive/archive_string.h | |
| parent | 132160f77407d2174d2bec0a8ba9c6eefc4429d7 (diff) | |
Diffstat (limited to 'libarchive/archive_string.h')
| -rw-r--r-- | libarchive/archive_string.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libarchive/archive_string.h b/libarchive/archive_string.h index 0e4c9b9041e3e..23f49165749c0 100644 --- a/libarchive/archive_string.h +++ b/libarchive/archive_string.h @@ -110,18 +110,20 @@ archive_string_conversion_charset_name(struct archive_string_conv *); void archive_string_conversion_set_opt(struct archive_string_conv *, int); #define SCONV_SET_OPT_UTF8_LIBARCHIVE2X 1 +#define SCONV_SET_OPT_NORMALIZATION_C 2 +#define SCONV_SET_OPT_NORMALIZATION_D 4 /* 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 *); @@ -162,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) \ |