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=6f0c6d88b6c0c59e4f2a16369685beba21c0e2b0 commit 6f0c6d88b6c0c59e4f2a16369685beba21c0e2b0 Author: Guillem Jover <[email protected]> AuthorDate: Mon Jul 22 15:24:00 2024 +0200 libdpkg: Rename varbuf_*printf() to varbuf_add_*fmt() The new function names make it clear that we are adding the formatted strings into the varbuf, which will give room to add formatted set variants, without using confusing names. --- lib/dpkg/libdpkg.map | 4 ++-- lib/dpkg/varbuf.c | 6 +++--- lib/dpkg/varbuf.h | 14 ++++++++------ 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/lib/dpkg/libdpkg.map b/lib/dpkg/libdpkg.map index c93d21c5c..0b69c39ff 100644 --- a/lib/dpkg/libdpkg.map +++ b/lib/dpkg/libdpkg.map @@ -121,6 +121,8 @@ LIBDPKG_PRIVATE { varbuf_set_varbuf; varbuf_set_buf; varbuf_add_varbuf; + varbuf_add_vfmt; + varbuf_add_fmt; varbuf_add_char; varbuf_dup_char; varbuf_map_char; @@ -130,8 +132,6 @@ LIBDPKG_PRIVATE { varbuf_has_suffix; varbuf_trim_varbuf_prefix; varbuf_trim_char_prefix; - varbuf_printf; - varbuf_vprintf; varbuf_detach; varbuf_snapshot; varbuf_rollback; diff --git a/lib/dpkg/varbuf.c b/lib/dpkg/varbuf.c index e548f3dab..4a38b47cc 100644 --- a/lib/dpkg/varbuf.c +++ b/lib/dpkg/varbuf.c @@ -235,7 +235,7 @@ varbuf_trim_char_prefix(struct varbuf *v, int prefix) } int -varbuf_vprintf(struct varbuf *v, const char *fmt, va_list args) +varbuf_add_vfmt(struct varbuf *v, const char *fmt, va_list args) { va_list args_copy; int needed, n; @@ -259,13 +259,13 @@ varbuf_vprintf(struct varbuf *v, const char *fmt, va_list args) } int -varbuf_printf(struct varbuf *v, const char *fmt, ...) +varbuf_add_fmt(struct varbuf *v, const char *fmt, ...) { va_list args; int n; va_start(args, fmt); - n = varbuf_vprintf(v, fmt, args); + n = varbuf_add_vfmt(v, fmt, args); va_end(args); return n; diff --git a/lib/dpkg/varbuf.h b/lib/dpkg/varbuf.h index ca22669c5..3d28c1096 100644 --- a/lib/dpkg/varbuf.h +++ b/lib/dpkg/varbuf.h @@ -99,16 +99,18 @@ void varbuf_map_char(struct varbuf *v, int c_src, int c_dst); #define varbuf_add_strn(v, s, n) varbuf_add_buf(v, s, strnlen(s, n)) void varbuf_add_dir(struct varbuf *v, const char *dirname); void varbuf_add_buf(struct varbuf *v, const void *s, size_t size); +int varbuf_add_fmt(struct varbuf *v, const char *fmt, ...) + DPKG_ATTR_PRINTF(2); +int varbuf_add_vfmt(struct varbuf *v, const char *fmt, va_list args) + DPKG_ATTR_VPRINTF(2); +#define varbuf_printf varbuf_add_fmt +#define varbuf_vprintf varbuf_add_vfmt bool varbuf_has_prefix(struct varbuf *v, struct varbuf *prefix); bool varbuf_has_suffix(struct varbuf *v, struct varbuf *suffix); void varbuf_trim_varbuf_prefix(struct varbuf *v, struct varbuf *prefix); void varbuf_trim_char_prefix(struct varbuf *v, int prefix); -int varbuf_printf(struct varbuf *v, const char *fmt, ...) DPKG_ATTR_PRINTF(2); -int varbuf_vprintf(struct varbuf *v, const char *fmt, va_list va) - DPKG_ATTR_VPRINTF(2); - struct varbuf_state { struct varbuf *v; size_t used; @@ -161,7 +163,7 @@ varbuf::fmt(const char *_fmt, ...) int rc; va_start(args, _fmt); - rc = varbuf_vprintf(this, _fmt, args); + rc = varbuf_add_vfmt(this, _fmt, args); va_end(args); return rc; @@ -170,7 +172,7 @@ varbuf::fmt(const char *_fmt, ...) inline int varbuf::vfmt(const char *_fmt, va_list va) { - return varbuf_vprintf(this, _fmt, va); + return varbuf_add_vfmt(this, _fmt, va); } inline void -- Dpkg.Org's dpkg
