diff options
| author | Guillem Jover <guillem@debian.org> | 2013-08-08 11:20:32 +0200 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2013-08-10 20:13:09 +0200 |
| commit | c8663a7da87bea618442970b6bdf6f3a9eba32be (patch) | |
| tree | fda4cf7755d6f0adcd00cb91f23c776082c9c9e9 | |
| parent | 72f4e49f965e8860d541bec7fea814d2cea85c81 (diff) | |
| download | dpkg-c8663a7da87bea618442970b6bdf6f3a9eba32be.tar.gz | |
libdpkg: Refactor fieldname dumping into a new varbuf_add_fieldname()
| -rw-r--r-- | lib/dpkg/dump.c | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/lib/dpkg/dump.c b/lib/dpkg/dump.c index da0df1135..d5d70cc06 100644 --- a/lib/dpkg/dump.c +++ b/lib/dpkg/dump.c @@ -46,6 +46,13 @@ #include <dpkg/dir.h> #include <dpkg/parsedump.h> +static inline void +varbuf_add_fieldname(struct varbuf *vb, const struct fieldinfo *fip) +{ + varbuf_add_str(vb, fip->name); + varbuf_add_str(vb, ": "); +} + void w_name(struct varbuf *vb, const struct pkginfo *pkg, const struct pkgbin *pkgbin, @@ -125,10 +132,8 @@ w_charfield(struct varbuf *vb, if (str_is_unset(value)) return; - if (flags&fw_printheader) { - varbuf_add_str(vb, fip->name); - varbuf_add_str(vb, ": "); - } + if (flags & fw_printheader) + varbuf_add_fieldname(vb, fip); varbuf_add_str(vb, value); if (flags&fw_printheader) varbuf_add_char(vb, '\n'); @@ -172,10 +177,8 @@ w_booleandefno(struct varbuf *vb, if ((flags & fw_printheader) && !value) return; - if (flags & fw_printheader) { - varbuf_add_str(vb, fip->name); - varbuf_add_str(vb, ": "); - } + if (flags & fw_printheader) + varbuf_add_fieldname(vb, fip); varbuf_add_str(vb, value ? "yes" : "no"); @@ -193,10 +196,8 @@ w_multiarch(struct varbuf *vb, if ((flags & fw_printheader) && !value) return; - if (flags & fw_printheader) { - varbuf_add_str(vb, fip->name); - varbuf_add_str(vb, ": "); - } + if (flags & fw_printheader) + varbuf_add_fieldname(vb, fip); varbuf_add_str(vb, multiarchinfos[value].name); @@ -216,10 +217,8 @@ w_architecture(struct varbuf *vb, if (pkgbin->arch->type == arch_empty) return; - if (flags & fw_printheader) { - varbuf_add_str(vb, fip->name); - varbuf_add_str(vb, ": "); - } + if (flags & fw_printheader) + varbuf_add_fieldname(vb, fip); varbuf_add_str(vb, pkgbin->arch->name); if (flags & fw_printheader) varbuf_add_char(vb, '\n'); |