Add CPP glue to be able to turn off static-ness of internal functions while testing. We don't want these functions generally visible in libpkg.so, but we do want to be able to exercise them individually from within atf.
modified libpkg/pkg_printf.c
@@ -38,6 +38,12 @@
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -256,90 +262,90 @@ struct percent_esc {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -491,7 +497,7 @@ static const char *boolean_str[2][3] = {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -521,7 +527,7 @@ format_shlibs(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -535,7 +541,7 @@ format_shlib_name(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -566,7 +572,7 @@ format_categories(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -580,7 +586,7 @@ format_category_name(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -610,7 +616,7 @@ format_directories(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -622,7 +628,7 @@ format_directory_group(struct sbuf *sbuf, const void *data,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -633,7 +639,7 @@ format_directory_keepflag(struct sbuf *sbuf, const void *data,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -644,7 +650,7 @@ format_directory_path(struct sbuf *sbuf, const void *data, struct percent_esc *p
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -656,7 +662,7 @@ format_directory_perms(struct sbuf *sbuf, const void *data,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -668,7 +674,7 @@ format_directory_tryflag(struct sbuf *sbuf, const void *data,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -683,7 +689,7 @@ format_directory_user(struct sbuf *sbuf, const void *data,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -713,7 +719,7 @@ format_files(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -724,7 +730,7 @@ format_file_group(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -735,7 +741,7 @@ format_file_keepflag(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -746,7 +752,7 @@ format_file_path(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -757,7 +763,7 @@ format_file_perms(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -768,7 +774,7 @@ format_file_sha256(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -782,7 +788,7 @@ format_file_user(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -812,7 +818,7 @@ format_groups(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -823,7 +829,7 @@ format_group_gidstr(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -834,7 +840,7 @@ format_group_name(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -847,7 +853,7 @@ format_row_counter(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -881,7 +887,7 @@ format_licenses(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -892,7 +898,7 @@ format_license_name(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -907,7 +913,7 @@ format_message(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -937,7 +943,7 @@ format_options(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -948,7 +954,7 @@ format_option_name(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -962,7 +968,7 @@ format_option_value(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -992,7 +998,7 @@ format_users(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1003,7 +1009,7 @@ format_user_name(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1016,7 +1022,7 @@ format_user_uidstr(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1029,7 +1035,7 @@ format_autoremove(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1044,7 +1050,7 @@ format_comment(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1074,7 +1080,7 @@ format_dependencies(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1086,7 +1092,7 @@ format_dependency_name(struct sbuf *sbuf, const void *data,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1098,7 +1104,7 @@ format_dependency_origin(struct sbuf *sbuf, const void *data,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1110,7 +1116,7 @@ format_dependency_version(struct sbuf *sbuf, const void *data,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1125,7 +1131,7 @@ format_add_info(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1140,7 +1146,7 @@ format_lock_status(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1177,7 +1183,7 @@ format_license_logic(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1190,7 +1196,7 @@ format_maintainer(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1203,7 +1209,7 @@ format_name(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1216,7 +1222,7 @@ format_origin(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1231,7 +1237,7 @@ format_prefix(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1265,7 +1271,7 @@ format_requirements(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1281,7 +1287,7 @@ format_flatsize(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1304,7 +1310,7 @@ format_install_tstamp(struct sbuf *sbuf, const void *data, struct percent_esc *p
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1317,7 +1323,7 @@ format_version(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1330,7 +1336,7 @@ format_home_url(struct sbuf *sbuf, const void *data, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1342,7 +1348,7 @@ format_literal_percent(struct sbuf *sbuf, __unused const void *data,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1352,7 +1358,7 @@ format_unknown(struct sbuf *sbuf, __unused const void *data,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1363,7 +1369,7 @@ free_percent_esc(struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1388,7 +1394,7 @@ new_percent_esc(struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1441,7 +1447,7 @@ gen_format(char *buf, size_t buflen, unsigned flags, const char *tail)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1479,7 +1485,7 @@ human_number(struct sbuf *sbuf, int64_t number, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1500,7 +1506,7 @@ string_val(struct sbuf *sbuf, const char *str, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1517,7 +1523,7 @@ int_val(struct sbuf *sbuf, int64_t value, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1534,7 +1540,7 @@ bool_val(struct sbuf *sbuf, bool value, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1564,7 +1570,7 @@ mode_val(struct sbuf *sbuf, mode_t mode, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1577,7 +1583,7 @@ list_count(struct sbuf *sbuf, int64_t count, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1592,7 +1598,7 @@ set_list_defaults(struct percent_esc *p, const char *item_fmt,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1619,7 +1625,7 @@ iterate_item(struct sbuf *sbuf, const struct pkg *pkg, const char *format,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1667,7 +1673,7 @@ field_modifier(const char *f, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1720,7 +1726,7 @@ field_width(const char *f, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1774,7 +1780,7 @@ format_trailer(const char *f, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1828,7 +1834,7 @@ parse_format(const char *f, unsigned context, struct percent_esc *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1962,7 +1968,7 @@ maybe_read_hex_byte(struct sbuf *sbuf, const char *f)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2010,7 +2016,7 @@ done:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2067,7 +2073,7 @@ process_escape(struct sbuf *sbuf, const char *f)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -2101,7 +2107,7 @@ process_format_trailer(struct sbuf *sbuf, const char *f, const struct pkg *pkg,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|