Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 4f21786
Don't use inline -- makes no sense if the function is to be called via a pointer.
Matthew Seaman committed 12 years ago
commit 4f217861cd09a4b6cbbdeb79d2e4ebc667725462
parent 06b1162
1 file changed +19 -18
modified libpkg/pkg_printf.c
@@ -261,6 +261,7 @@ struct percent_esc {
+ 


/* These are in ASCII order: alphabetical with A-Z sorting before a-z */

static const struct pkg_printf_fmt	fmt[] = {

	[PP_PKG_SHLIBS] =
@@ -750,7 +751,7 @@ human_number(struct sbuf *sbuf, int64_t number, struct percent_esc *p)
	return (sbuf);

}
- 
static inline struct sbuf *
+ 
static struct sbuf *

string_val(struct sbuf *sbuf, const char *str, struct percent_esc *p)

{

	char	format[16];
@@ -771,7 +772,7 @@ string_val(struct sbuf *sbuf, const char *str, struct percent_esc *p)
	return (sbuf);

}
- 
static inline struct sbuf *
+ 
static struct sbuf *

int_val(struct sbuf *sbuf, int64_t value, struct percent_esc *p)

{

	if (p->flags & (PP_ALTERNATE_FORM1|PP_ALTERNATE_FORM2))
@@ -788,7 +789,7 @@ int_val(struct sbuf *sbuf, int64_t value, struct percent_esc *p)
	return (sbuf);

}
- 
static inline struct sbuf *
+ 
static struct sbuf *

bool_val(struct sbuf *sbuf, bool value, struct percent_esc *p)

{

	int	alternate;
@@ -805,7 +806,7 @@ bool_val(struct sbuf *sbuf, bool value, struct percent_esc *p)
	return (string_val(sbuf, boolean_str[value][alternate], p));

}
- 
static inline struct sbuf *
+ 
static struct sbuf *

mode_val(struct sbuf *sbuf, mode_t mode, struct percent_esc *p)

{

	/* Print mode as an octal integer '%o' by default.
@@ -835,7 +836,7 @@ mode_val(struct sbuf *sbuf, mode_t mode, struct percent_esc *p)
	return (sbuf);

}
- 
static inline struct sbuf *
+ 
static struct sbuf *

list_count(struct sbuf *sbuf, int64_t count, struct percent_esc *p)

{

	/* Convert to 0 or 1 for %?X */
@@ -848,7 +849,7 @@ list_count(struct sbuf *sbuf, int64_t count, struct percent_esc *p)
	return (int_val(sbuf, count, p));

}
- 
static inline struct percent_esc *
+ 
static struct percent_esc *

set_list_defaults(struct percent_esc *p, const char *item_fmt,

		  const char *sep_fmt)

{
@@ -1272,7 +1273,7 @@ format_license_name(struct sbuf *sbuf, struct pkg_license *license,
/*

 * %M -- Pkg message. string.  Accepts field-width, left-align

 */
- 
static inline struct sbuf *
+ 
static struct sbuf *

format_message(struct sbuf *sbuf, struct pkg *pkg, struct percent_esc *p)

{

	char	*message;
@@ -1387,7 +1388,7 @@ format_user_uidstr(struct sbuf *sbuf, struct pkg_user *user,
 * Standard form: 0, 1.  Alternate form1: no, yes.  Alternate form2:

 * false, true

 */
- 
static inline struct sbuf *
+ 
static struct sbuf *

format_autoremove(struct sbuf *sbuf, struct pkg *pkg, struct percent_esc *p)

{

	bool	automatic;
@@ -1399,7 +1400,7 @@ format_autoremove(struct sbuf *sbuf, struct pkg *pkg, struct percent_esc *p)
/*

 * %c -- Comment. string.  Accepts field-width, left-align

 */
- 
static inline struct sbuf *
+ 
static struct sbuf *

format_comment(struct sbuf *sbuf, struct pkg *pkg, struct percent_esc *p)

{

	char	*comment;
@@ -1472,7 +1473,7 @@ format_dependency_version(struct sbuf *sbuf, struct pkg_dep *dep,
/*

 * %i -- Additional info. string. Accepts field-width, left-align

 */
- 
static inline struct sbuf *
+ 
static struct sbuf *

format_add_info(struct sbuf *sbuf, struct pkg *pkg, struct percent_esc *p)

{

	char	*info;
@@ -1486,7 +1487,7 @@ format_add_info(struct sbuf *sbuf, struct pkg *pkg, struct percent_esc *p)
 * Standard form: 0, 1.  Alternate form1: no, yes.  Alternate form2:

 * false, true

 */
- 
static inline struct sbuf *
+ 
static struct sbuf *

format_lock_status(struct sbuf *sbuf, struct pkg *pkg, struct percent_esc *p)

{

	bool	locked;
@@ -1536,7 +1537,7 @@ format_license_logic(struct sbuf *sbuf, struct pkg *pkg, struct percent_esc *p)
/*

 * %m -- Maintainer e-mail address. string.  Accepts field-width, left-align

 */
- 
static inline struct sbuf *
+ 
static struct sbuf *

format_maintainer(struct sbuf *sbuf, struct pkg *pkg, struct percent_esc *p)

{

	char	*maintainer;
@@ -1548,7 +1549,7 @@ format_maintainer(struct sbuf *sbuf, struct pkg *pkg, struct percent_esc *p)
/*

 * %n -- Package name. string.  Accepts field-width, left-align

 */
- 
static inline struct sbuf *
+ 
static struct sbuf *

format_name(struct sbuf *sbuf, struct pkg *pkg, struct percent_esc *p)

{

	char	*name;
@@ -1560,7 +1561,7 @@ format_name(struct sbuf *sbuf, struct pkg *pkg, struct percent_esc *p)
/*

 * %o -- Package origin. string.  Accepts field-width, left-align

 */
- 
static inline struct sbuf *
+ 
static struct sbuf *

format_origin(struct sbuf *sbuf, struct pkg *pkg, struct percent_esc *p)

{

	char	*origin;
@@ -1572,7 +1573,7 @@ format_origin(struct sbuf *sbuf, struct pkg *pkg, struct percent_esc *p)
/*

 * %p -- Installation prefix. string. Accepts field-width, left-align

 */
- 
static inline struct sbuf *
+ 
static struct sbuf *

format_prefix(struct sbuf *sbuf, struct pkg *pkg, struct percent_esc *p)

{

	char	*prefix;
@@ -1618,7 +1619,7 @@ format_requirements(struct sbuf *sbuf, struct pkg *pkg, struct percent_esc *p)
 * exponents (k, M, G).  Alternate form 2, ditto, but using binary

 * scale prefixes (ki, Mi, Gi etc.)

 */
- 
static inline struct sbuf *
+ 
static struct sbuf *

format_flatsize(struct sbuf *sbuf, struct pkg *pkg, struct percent_esc *p)

{

	int64_t	flatsize;
@@ -1633,7 +1634,7 @@ format_flatsize(struct sbuf *sbuf, struct pkg *pkg, struct percent_esc *p)
 * format string in %{ %}.  Default is to print seconds-since-epoch as

 * an integer applying our integer format modifiers.

 */
- 
static inline struct sbuf *
+ 
static struct sbuf *

format_install_tstamp(struct sbuf *sbuf, struct pkg *pkg,

		      struct percent_esc *p)

{
@@ -1668,7 +1669,7 @@ format_version(struct sbuf *sbuf, struct pkg *pkg, struct percent_esc *p)
/*

 * %w -- Home page URL.  string.  Accepts field width, left align

 */
- 
static inline struct sbuf *
+ 
static struct sbuf *

format_home_url(struct sbuf *sbuf, struct pkg *pkg,

		struct percent_esc *p)

{