diff options
| author | Guillem Jover <guillem@debian.org> | 2011-01-10 15:12:42 +0100 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2011-01-16 10:19:21 +0100 |
| commit | 559d66ec3f4a649e65cc87dc6bea708c9289c1ff (patch) | |
| tree | 18567e5a3c49087b35771a6968432032d965cfe5 | |
| parent | d5c59894cca3f776c68e499aaea1d697d2d1afd2 (diff) | |
| download | dpkg-559d66ec3f4a649e65cc87dc6bea708c9289c1ff.tar.gz | |
libdpkg: Rename varbufdupc() to varbuf_dup_char()
Make the varbuf API a bit more consistent.
| -rw-r--r-- | lib/dpkg/libdpkg.Versions | 2 | ||||
| -rw-r--r-- | lib/dpkg/test/t-varbuf.c | 8 | ||||
| -rw-r--r-- | lib/dpkg/varbuf.c | 2 | ||||
| -rw-r--r-- | lib/dpkg/varbuf.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/lib/dpkg/libdpkg.Versions b/lib/dpkg/libdpkg.Versions index 7bf131caf..7291519c0 100644 --- a/lib/dpkg/libdpkg.Versions +++ b/lib/dpkg/libdpkg.Versions @@ -56,7 +56,7 @@ LIBDPKG_PRIVATE { varbuf_grow; varbuf_trunc; varbufaddc; - varbufdupc; + varbuf_dup_char; varbuf_map_char; varbufaddbuf; varbufprintf; diff --git a/lib/dpkg/test/t-varbuf.c b/lib/dpkg/test/t-varbuf.c index 5211bcd54..63381bd81 100644 --- a/lib/dpkg/test/t-varbuf.c +++ b/lib/dpkg/test/t-varbuf.c @@ -162,18 +162,18 @@ test_varbuf_addc(void) } static void -test_varbuf_dupc(void) +test_varbuf_dup_char(void) { struct varbuf vb; varbuf_init(&vb, 5); - varbufdupc(&vb, 'z', 10); + varbuf_dup_char(&vb, 'z', 10); test_pass(vb.used == 10); test_pass(vb.size >= vb.used); test_mem(vb.buf, ==, "zzzzzzzzzz", 10); - varbufdupc(&vb, 'y', 5); + varbuf_dup_char(&vb, 'y', 5); test_pass(vb.used == 15); test_pass(vb.size >= vb.used); test_mem(vb.buf, ==, "zzzzzzzzzzyyyyy", 15); @@ -275,7 +275,7 @@ test(void) test_varbuf_trunc(); test_varbuf_addbuf(); test_varbuf_addc(); - test_varbuf_dupc(); + test_varbuf_dup_char(); test_varbuf_map_char(); test_varbuf_printf(); test_varbuf_reset(); diff --git a/lib/dpkg/varbuf.c b/lib/dpkg/varbuf.c index 51d56993f..1baa84024 100644 --- a/lib/dpkg/varbuf.c +++ b/lib/dpkg/varbuf.c @@ -38,7 +38,7 @@ varbufaddc(struct varbuf *v, int c) } void -varbufdupc(struct varbuf *v, int c, size_t n) +varbuf_dup_char(struct varbuf *v, int c, size_t n) { varbuf_grow(v, n); memset(v->buf + v->used, c, n); diff --git a/lib/dpkg/varbuf.h b/lib/dpkg/varbuf.h index 1c272357e..0cd7b92b4 100644 --- a/lib/dpkg/varbuf.h +++ b/lib/dpkg/varbuf.h @@ -72,7 +72,7 @@ void varbuf_reset(struct varbuf *v); void varbuf_destroy(struct varbuf *v); void varbufaddc(struct varbuf *v, int c); -void varbufdupc(struct varbuf *v, int c, size_t n); +void varbuf_dup_char(struct varbuf *v, int c, size_t n); void varbuf_map_char(struct varbuf *v, int c_src, int c_dst); #define varbufaddstr(v, s) varbufaddbuf(v, s, strlen(s)) void varbufaddbuf(struct varbuf *v, const void *s, size_t size); |