pkg_printf: migrate to open_memstream
modified libpkg/libpkg.ver
@@ -167,8 +167,6 @@ global:
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
|
modified libpkg/pkg.h.in
@@ -1601,29 +1601,6 @@ int pkg_asprintf(char **ret, const char * restrict format, ...);
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
modified libpkg/pkg_printf.c
@@ -1,6 +1,6 @@
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -42,7 +42,6 @@
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -165,6 +164,7 @@
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -172,7 +172,7 @@ struct pkg_printf_fmt {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -852,8 +852,8 @@ static const struct pkg_printf_fmt fmt[] = {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -866,12 +866,14 @@ format_annotations(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -882,8 +884,8 @@ format_annotations(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -893,8 +895,8 @@ format_annotation_name(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -906,8 +908,8 @@ format_annotation_value(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -920,12 +922,14 @@ format_shlibs_required(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -937,8 +941,8 @@ format_shlibs_required(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -951,8 +955,8 @@ format_shlib_name(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -964,12 +968,14 @@ format_categories(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -980,8 +986,8 @@ format_categories(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -994,8 +1000,8 @@ format_category_name(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1008,12 +1014,14 @@ format_directories(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1024,8 +1032,8 @@ format_directories(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1036,8 +1044,8 @@ format_directory_group(UT_string *buf, const void *data,
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1047,8 +1055,8 @@ format_directory_path(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1059,8 +1067,8 @@ format_directory_perms(UT_string *buf, const void *data,
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1074,8 +1082,8 @@ format_directory_user(UT_string *buf, const void *data,
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1088,12 +1096,14 @@ format_files(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1104,8 +1114,8 @@ format_files(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1115,8 +1125,8 @@ format_file_group(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1126,8 +1136,8 @@ format_file_path(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1137,8 +1147,8 @@ format_file_perms(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1148,8 +1158,8 @@ format_file_sha256(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1162,8 +1172,8 @@ format_file_user(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1176,12 +1186,14 @@ format_groups(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1192,8 +1204,8 @@ format_groups(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1203,8 +1215,8 @@ format_group_name(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1216,8 +1228,8 @@ format_row_counter(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1229,12 +1241,14 @@ format_licenses(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1245,8 +1259,8 @@ format_licenses(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1256,52 +1270,56 @@ format_license_name(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1309,8 +1327,8 @@ format_message(UT_string *buffer, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1329,8 +1347,8 @@ format_repo_ident(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1343,12 +1361,14 @@ format_options(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1359,8 +1379,8 @@ format_options(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1370,8 +1390,8 @@ format_option_name(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1381,8 +1401,8 @@ format_option_value(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1392,8 +1412,8 @@ format_option_default(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1403,8 +1423,8 @@ format_option_description(UT_string *buf, const void *data, struct percent_esc *
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1414,8 +1434,8 @@ format_altabi(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1425,8 +1445,8 @@ format_repo_path(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1439,8 +1459,8 @@ format_char_string(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1453,12 +1473,14 @@ format_users(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1469,8 +1491,8 @@ format_users(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1480,8 +1502,8 @@ format_user_name(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1491,8 +1513,8 @@ format_old_version(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1505,8 +1527,8 @@ format_int_checksum(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1519,12 +1541,14 @@ format_required(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1535,8 +1559,8 @@ format_required(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1547,8 +1571,8 @@ format_provide_name(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1561,8 +1585,8 @@ format_autoremove(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1575,12 +1599,14 @@ format_shlibs_provided(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1591,8 +1617,8 @@ format_shlibs_provided(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1604,8 +1630,8 @@ format_comment(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1618,12 +1644,14 @@ format_dependencies(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1634,8 +1662,8 @@ format_dependencies(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1646,8 +1674,8 @@ format_dependency_lock(UT_string *buf, const void *data,
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1658,8 +1686,8 @@ format_dependency_name(UT_string *buf, const void *data,
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1670,8 +1698,8 @@ format_dependency_origin(UT_string *buf, const void *data,
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1682,8 +1710,8 @@ format_dependency_version(UT_string *buf, const void *data,
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1695,8 +1723,8 @@ format_description(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1708,8 +1736,8 @@ format_lock_status(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1719,8 +1747,8 @@ format_license_logic(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1730,8 +1758,8 @@ format_maintainer(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1741,8 +1769,8 @@ format_name(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1752,8 +1780,8 @@ format_origin(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1763,8 +1791,8 @@ format_prefix(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1776,8 +1804,8 @@ format_architecture(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1790,12 +1818,14 @@ format_requirements(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1810,8 +1840,8 @@ format_requirements(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1824,21 +1854,22 @@ format_flatsize(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1846,8 +1877,8 @@ format_install_tstamp(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1857,8 +1888,8 @@ format_version(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1868,8 +1899,8 @@ format_checksum(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1883,8 +1914,8 @@ format_home_url(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1896,8 +1927,8 @@ format_pkgsize(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1910,12 +1941,14 @@ format_provided(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1926,8 +1959,8 @@ format_provided(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1945,11 +1978,11 @@ format_short_checksum(UT_string *buf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1957,11 +1990,11 @@ format_literal_percent(UT_string *buf, __unused const void *data,
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1973,8 +2006,8 @@ new_percent_esc(void)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1984,8 +2017,8 @@ clear_percent_esc(struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1997,9 +2030,9 @@ free_percent_esc(struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2074,8 +2107,8 @@ gen_format(char *buf, size_t buflen, unsigned flags, const char *tail)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -2150,17 +2183,17 @@ human_number(UT_string *buf, int64_t number, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -2177,12 +2210,12 @@ string_val(UT_string *buf, const char *str, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -2193,13 +2226,13 @@ int_val(UT_string *buf, int64_t value, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -2219,8 +2252,8 @@ bool_val(UT_string *buf, bool value, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -2256,13 +2289,13 @@ mode_val(UT_string *buf, mode_t mode, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -2297,8 +2330,8 @@ liclog_val(UT_string *buf, lic_t licenselogic, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -2315,18 +2348,18 @@ set_list_defaults(struct percent_esc *p, const char *item_fmt,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -2338,7 +2371,7 @@ iterate_item(UT_string *buf, const struct pkg *pkg, const char *format,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2351,12 +2384,12 @@ iterate_item(UT_string *buf, const struct pkg *pkg, const char *format,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2491,7 +2524,8 @@ format_trailer(const char *f, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -2505,7 +2539,8 @@ format_trailer(const char *f, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -2513,8 +2548,8 @@ format_trailer(const char *f, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -2579,7 +2614,7 @@ parse_format(const char *f, unsigned context, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2711,19 +2746,19 @@ maybe_read_hex_byte(UT_string *buf, const char *f)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2765,51 +2800,51 @@ read_oct_byte(UT_string *buf, const char *f)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2828,7 +2863,7 @@ process_escape(UT_string *buf, const char *f)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2836,12 +2871,12 @@ process_escape(UT_string *buf, const char *f)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2866,10 +2901,10 @@ process_format_trailer(UT_string *buf, struct percent_esc *p,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2907,19 +2942,20 @@ pkg_printf(const char * restrict format, ...)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2951,19 +2987,20 @@ pkg_fprintf(FILE * restrict stream, const char * restrict format, ...)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2999,19 +3036,20 @@ pkg_dprintf(int fd, const char * restrict format, ...)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -3052,19 +3090,20 @@ int
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -3103,54 +3142,36 @@ pkg_asprintf(char **ret, const char * restrict format, ...)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -3163,7 +3184,7 @@ pkg_utstring_vprintf(UT_string * restrict buf, const char * restrict format,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -3182,12 +3203,12 @@ pkg_utstring_vprintf(UT_string * restrict buf, const char * restrict format,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified libpkg/private/pkg_printf.h
@@ -31,6 +31,7 @@
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -161,79 +162,79 @@ struct percent_esc {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -243,19 +244,19 @@ _static void free_percent_esc(struct percent_esc *);
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -264,14 +265,14 @@ _static const char *format_code(const char *, unsigned , struct percent_esc *);
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified tests/lib/pkg_printf_test.c
@@ -27,7 +27,7 @@
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -134,7 +134,7 @@ ATF_TC_HEAD(human_number, tc)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -308,22 +308,21 @@ ATF_TC_BODY(human_number, tc)
|
|
|
|
|
|
| - | |
|
|
|
|
| - | |
|
|
|
|
|
|
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -334,7 +333,7 @@ ATF_TC_HEAD(string_val, tc)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -392,22 +391,21 @@ ATF_TC_BODY(string_val, tc)
|
|
|
|
|
|
| - | |
|
|
|
|
| - | |
|
|
|
|
|
|
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -418,7 +416,7 @@ ATF_TC_HEAD(int_val, tc)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -632,22 +630,21 @@ ATF_TC_BODY(int_val, tc)
|
|
|
|
|
|
| - | |
|
|
|
|
| - | |
|
|
|
|
|
|
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -658,7 +655,7 @@ ATF_TC_HEAD(bool_val, tc)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -685,22 +682,21 @@ ATF_TC_BODY(bool_val, tc)
|
|
|
|
|
|
| - | |
|
|
|
|
| - | |
|
|
|
|
|
|
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -711,7 +707,7 @@ ATF_TC_HEAD(mode_val, tc)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -804,24 +800,23 @@ ATF_TC_BODY(mode_val, tc)
|
|
|
|
|
|
| - | |
|
|
|
|
| - | |
|
|
|
|
|
|
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -830,7 +825,7 @@ ATF_TC_HEAD(liclog_val, tc)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -860,22 +855,21 @@ ATF_TC_BODY(liclog_val, tc)
|
|
|
|
|
|
| - | |
|
|
|
|
| - | |
|
|
|
|
|
|
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -886,7 +880,7 @@ ATF_TC_HEAD(list_count, tc)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -908,22 +902,21 @@ ATF_TC_BODY(list_count, tc)
|
|
|
|
|
|
| - | |
|
|
|
|
| - | |
|
|
|
|
|
|
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -934,7 +927,7 @@ ATF_TC_HEAD(maybe_read_hex_byte, tc)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1003,25 +996,21 @@ ATF_TC_BODY(maybe_read_hex_byte, tc)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
|
|
| + | |
|
|
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1033,7 +1022,7 @@ ATF_TC_HEAD(read_oct_byte, tc)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1109,25 +1098,21 @@ ATF_TC_BODY(read_oct_byte, tc)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
|
|
| + | |
|
|
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1138,7 +1123,7 @@ ATF_TC_HEAD(process_escape, tc)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1175,25 +1160,21 @@ ATF_TC_BODY(process_escape, tc)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
|
|
| + | |
|
|
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2211,15 +2192,16 @@ ATF_TC_BODY(format_trailer, tc)
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2290,10 +2272,12 @@ ATF_TC_BODY(parse_format, tc)
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|