This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=c316137d14c826a2feef342eb64f4235b49f38bc commit c316137d14c826a2feef342eb64f4235b49f38bc Author: Guillem Jover <[email protected]> AuthorDate: Fri Dec 9 23:36:19 2022 +0100 utils: Switch to use libcompat attributes This avoids the dpkg namespaced attributes, for tools that are currently supposed to be generic and not tied to dpkg itself. --- utils/start-stop-daemon.c | 18 +++++++++--------- utils/update-alternatives.c | 32 ++++++++++++++++---------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c index a15c0493f..ae07abb99 100644 --- a/utils/start-stop-daemon.c +++ b/utils/start-stop-daemon.c @@ -292,7 +292,7 @@ static int schedule_length; static struct schedule_item *schedule = NULL; -static void DPKG_ATTR_PRINTF(1) +static void LIBCOMPAT_ATTR_PRINTF(1) debug(const char *format, ...) { va_list arglist; @@ -305,7 +305,7 @@ debug(const char *format, ...) va_end(arglist); } -static void DPKG_ATTR_PRINTF(1) +static void LIBCOMPAT_ATTR_PRINTF(1) info(const char *format, ...) { va_list arglist; @@ -318,7 +318,7 @@ info(const char *format, ...) va_end(arglist); } -static void DPKG_ATTR_PRINTF(1) +static void LIBCOMPAT_ATTR_PRINTF(1) warning(const char *format, ...) { va_list arglist; @@ -329,7 +329,7 @@ warning(const char *format, ...) va_end(arglist); } -static void DPKG_ATTR_NORET DPKG_ATTR_VPRINTF(2) +static void LIBCOMPAT_ATTR_NORET LIBCOMPAT_ATTR_VPRINTF(2) fatalv(int errno_fatal, const char *format, va_list args) { va_list args_copy; @@ -349,7 +349,7 @@ fatalv(int errno_fatal, const char *format, va_list args) exit(2); } -static void DPKG_ATTR_NORET DPKG_ATTR_PRINTF(1) +static void LIBCOMPAT_ATTR_NORET LIBCOMPAT_ATTR_PRINTF(1) fatal(const char *format, ...) { va_list args; @@ -358,7 +358,7 @@ fatal(const char *format, ...) fatalv(0, format, args); } -static void DPKG_ATTR_NORET DPKG_ATTR_PRINTF(1) +static void LIBCOMPAT_ATTR_NORET LIBCOMPAT_ATTR_PRINTF(1) fatale(const char *format, ...) { va_list args; @@ -369,7 +369,7 @@ fatale(const char *format, ...) #define BUG(...) bug(__FILE__, __LINE__, __func__, __VA_ARGS__) -static void DPKG_ATTR_NORET DPKG_ATTR_PRINTF(4) +static void LIBCOMPAT_ATTR_NORET LIBCOMPAT_ATTR_PRINTF(4) bug(const char *file, int line, const char *func, const char *format, ...) { va_list arglist; @@ -963,7 +963,7 @@ do_version(void) printf("Written by Marek Michalkiewicz, public domain.\n"); } -static void DPKG_ATTR_NORET +static void LIBCOMPAT_ATTR_NORET badusage(const char *msg) { if (msg) @@ -2706,7 +2706,7 @@ do_stop_summary(int retry_nr) printf(".\n"); } -static void DPKG_ATTR_PRINTF(1) +static void LIBCOMPAT_ATTR_PRINTF(1) set_what_stop(const char *format, ...) { va_list arglist; diff --git a/utils/update-alternatives.c b/utils/update-alternatives.c index 684518d21..26e165b16 100644 --- a/utils/update-alternatives.c +++ b/utils/update-alternatives.c @@ -181,7 +181,7 @@ usage(void) ), altdir, admdir); } -static void DPKG_ATTR_NORET DPKG_ATTR_PRINTF(1) +static void LIBCOMPAT_ATTR_NORET LIBCOMPAT_ATTR_PRINTF(1) error(char const *fmt, ...) { va_list args; @@ -194,7 +194,7 @@ error(char const *fmt, ...) exit(2); } -static void DPKG_ATTR_NORET DPKG_ATTR_PRINTF(1) +static void LIBCOMPAT_ATTR_NORET LIBCOMPAT_ATTR_PRINTF(1) syserr(char const *fmt, ...) { va_list args; @@ -207,7 +207,7 @@ syserr(char const *fmt, ...) exit(2); } -static void DPKG_ATTR_NORET DPKG_ATTR_PRINTF(1) +static void LIBCOMPAT_ATTR_NORET LIBCOMPAT_ATTR_PRINTF(1) badusage(char const *fmt, ...) { va_list args; @@ -223,7 +223,7 @@ badusage(char const *fmt, ...) exit(2); } -static void DPKG_ATTR_PRINTF(1) +static void LIBCOMPAT_ATTR_PRINTF(1) warning(char const *fmt, ...) { va_list args; @@ -238,7 +238,7 @@ warning(char const *fmt, ...) fprintf(stderr, "\n"); } -static void DPKG_ATTR_PRINTF(1) +static void LIBCOMPAT_ATTR_PRINTF(1) debug(char const *fmt, ...) { va_list args; @@ -253,7 +253,7 @@ debug(char const *fmt, ...) fprintf(stderr, "\n"); } -static void DPKG_ATTR_PRINTF(1) +static void LIBCOMPAT_ATTR_PRINTF(1) verbose(char const *fmt, ...) { va_list args; @@ -268,7 +268,7 @@ verbose(char const *fmt, ...) printf("\n"); } -static void DPKG_ATTR_PRINTF(1) +static void LIBCOMPAT_ATTR_PRINTF(1) info(char const *fmt, ...) { va_list args; @@ -283,7 +283,7 @@ info(char const *fmt, ...) printf("\n"); } -static void DPKG_ATTR_PRINTF(1) +static void LIBCOMPAT_ATTR_PRINTF(1) pr(char const *fmt, ...) { va_list args; @@ -336,7 +336,7 @@ xstrndup(const char *str, size_t n) return new_str; } -static char * DPKG_ATTR_VPRINTF(1) +static char * LIBCOMPAT_ATTR_VPRINTF(1) xvasprintf(const char *fmt, va_list args) { char *str; @@ -347,7 +347,7 @@ xvasprintf(const char *fmt, va_list args) return str; } -static char * DPKG_ATTR_PRINTF(1) +static char * LIBCOMPAT_ATTR_PRINTF(1) xasprintf(const char *fmt, ...) { va_list args; @@ -438,7 +438,7 @@ xrename(const char *src, const char *dst) syserr(_("unable to install '%.250s' as '%.250s'"), src, dst); } -static void DPKG_ATTR_PRINTF(1) +static void LIBCOMPAT_ATTR_PRINTF(1) xunlink_args(const char *fmt, ...) { va_list args; @@ -498,7 +498,7 @@ make_path(const char *pathname, mode_t mode) return 0; } -static void DPKG_ATTR_PRINTF(1) +static void LIBCOMPAT_ATTR_PRINTF(1) log_msg(const char *fmt, ...) { va_list args; @@ -707,7 +707,7 @@ fsys_rm(const char *f) free(root_f); } -static void DPKG_ATTR_PRINTF(1) +static void LIBCOMPAT_ATTR_PRINTF(1) fsys_rm_args(const char *fmt, ...) { va_list args; @@ -1265,7 +1265,7 @@ struct altdb_context { char *filename; enum altdb_flags flags; bool modified; - void DPKG_ATTR_NORET DPKG_ATTR_PRINTF(2) + void LIBCOMPAT_ATTR_NORET LIBCOMPAT_ATTR_PRINTF(2) (*bad_format)(struct altdb_context *, const char *format, ...); jmp_buf on_error; }; @@ -1354,7 +1354,7 @@ altdb_get_line(struct altdb_context *ctx, const char *name) return buf; } -static void DPKG_ATTR_NORET DPKG_ATTR_PRINTF(2) +static void LIBCOMPAT_ATTR_NORET LIBCOMPAT_ATTR_PRINTF(2) altdb_parse_error(struct altdb_context *ctx, const char *format, ...) { char *msg; @@ -1367,7 +1367,7 @@ altdb_parse_error(struct altdb_context *ctx, const char *format, ...) error(_("%s corrupt: %s"), ctx->filename, msg); } -static void DPKG_ATTR_NORET DPKG_ATTR_PRINTF(2) +static void LIBCOMPAT_ATTR_NORET LIBCOMPAT_ATTR_PRINTF(2) altdb_parse_stop(struct altdb_context *ctx, const char *format, ...) { longjmp(ctx->on_error, 1); -- Dpkg.Org's dpkg
