Deleted Added
full compact
archive_string.h (302408) archive_string.h (311041)
1/*-
2 * Copyright (c) 2003-2010 Tim Kientzle
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 8 unchanged lines hidden (view full) ---

17 * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
18 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 *
1/*-
2 * Copyright (c) 2003-2010 Tim Kientzle
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 8 unchanged lines hidden (view full) ---

17 * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
18 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 *
25 * $FreeBSD: stable/11/contrib/libarchive/libarchive/archive_string.h 238856 2012-07-28 06:38:44Z mm $
25 * $FreeBSD: stable/11/contrib/libarchive/libarchive/archive_string.h 311041 2017-01-02 01:41:31Z mm $
26 *
27 */
28
29#ifndef __LIBARCHIVE_BUILD
30#ifndef __LIBARCHIVE_TEST
31#error This header is only to be used internally to libarchive.
32#endif
33#endif

--- 76 unchanged lines hidden (view full) ---

110void
111archive_string_conversion_set_opt(struct archive_string_conv *, int);
112#define SCONV_SET_OPT_UTF8_LIBARCHIVE2X 1
113#define SCONV_SET_OPT_NORMALIZATION_C 2
114#define SCONV_SET_OPT_NORMALIZATION_D 4
115
116
117/* Copy one archive_string to another in locale conversion.
26 *
27 */
28
29#ifndef __LIBARCHIVE_BUILD
30#ifndef __LIBARCHIVE_TEST
31#error This header is only to be used internally to libarchive.
32#endif
33#endif

--- 76 unchanged lines hidden (view full) ---

110void
111archive_string_conversion_set_opt(struct archive_string_conv *, int);
112#define SCONV_SET_OPT_UTF8_LIBARCHIVE2X 1
113#define SCONV_SET_OPT_NORMALIZATION_C 2
114#define SCONV_SET_OPT_NORMALIZATION_D 4
115
116
117/* Copy one archive_string to another in locale conversion.
118 * Return -1 if conversion failes. */
118 * Return -1 if conversion fails. */
119int
120archive_strncpy_l(struct archive_string *, const void *, size_t,
121 struct archive_string_conv *);
122
123/* Copy one archive_string to another in locale conversion.
119int
120archive_strncpy_l(struct archive_string *, const void *, size_t,
121 struct archive_string_conv *);
122
123/* Copy one archive_string to another in locale conversion.
124 * Return -1 if conversion failes. */
124 * Return -1 if conversion fails. */
125int
126archive_strncat_l(struct archive_string *, const void *, size_t,
127 struct archive_string_conv *);
128
129
130/* Copy one archive_string to another */
131#define archive_string_copy(dest, src) \
132 ((dest)->length = 0, archive_string_concat((dest), (src)))

--- 107 unchanged lines hidden ---
125int
126archive_strncat_l(struct archive_string *, const void *, size_t,
127 struct archive_string_conv *);
128
129
130/* Copy one archive_string to another */
131#define archive_string_copy(dest, src) \
132 ((dest)->length = 0, archive_string_concat((dest), (src)))

--- 107 unchanged lines hidden ---