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=0746b6a92482f55b16310e519ed4773399775e65 commit 0746b6a92482f55b16310e519ed4773399775e65 Author: Guillem Jover <[email protected]> AuthorDate: Sat Aug 10 06:39:08 2024 +0200 libdpkg: Rename varbuf_rollback_start() to varbuf_rollback_end() This returns a pointer to the end of the string after a rollback, not the start. --- lib/dpkg/dbmodify.c | 4 ++-- lib/dpkg/libdpkg.map | 2 +- lib/dpkg/t/t-varbuf.c | 14 +++++++------- lib/dpkg/varbuf.c | 2 +- lib/dpkg/varbuf.h | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/dpkg/dbmodify.c b/lib/dpkg/dbmodify.c index cefbc9df1..cf04285a7 100644 --- a/lib/dpkg/dbmodify.c +++ b/lib/dpkg/dbmodify.c @@ -393,7 +393,7 @@ void modstatdb_checkpoint(void) { /* Have we made a real mess? */ if (varbuf_rollback_len(&updatefn_state) > IMPORTANTMAXLEN) internerr("modstatdb update entry name '%s' longer than %d", - varbuf_rollback_start(&updatefn_state), IMPORTANTMAXLEN); + varbuf_rollback_end(&updatefn_state), IMPORTANTMAXLEN); if (unlink(updatefn.buf)) ohshite(_("failed to remove my own update file %.255s"), updatefn.buf); @@ -462,7 +462,7 @@ modstatdb_note_core(struct pkginfo *pkg) /* Have we made a real mess? */ if (varbuf_rollback_len(&updatefn_state) > IMPORTANTMAXLEN) internerr("modstatdb update entry name '%s' longer than %d", - varbuf_rollback_start(&updatefn_state), IMPORTANTMAXLEN); + varbuf_rollback_end(&updatefn_state), IMPORTANTMAXLEN); nextupdate++; diff --git a/lib/dpkg/libdpkg.map b/lib/dpkg/libdpkg.map index 3b29ad44a..c93d21c5c 100644 --- a/lib/dpkg/libdpkg.map +++ b/lib/dpkg/libdpkg.map @@ -136,7 +136,7 @@ LIBDPKG_PRIVATE { varbuf_snapshot; varbuf_rollback; varbuf_rollback_len; - varbuf_rollback_start; + varbuf_rollback_end; varbuf_destroy; varbuf_free; diff --git a/lib/dpkg/t/t-varbuf.c b/lib/dpkg/t/t-varbuf.c index 1ab1cf206..6763c996a 100644 --- a/lib/dpkg/t/t-varbuf.c +++ b/lib/dpkg/t/t-varbuf.c @@ -529,34 +529,34 @@ test_varbuf_snapshot(void) test_pass(vb.used == 0); test_pass(vb.used == vbs.used); test_pass(varbuf_rollback_len(&vbs) == 0); - test_str(varbuf_rollback_start(&vbs), ==, ""); + test_str(varbuf_rollback_end(&vbs), ==, ""); varbuf_add_buf(&vb, "1234567890", 10); test_pass(vb.used == 10); test_pass(varbuf_rollback_len(&vbs) == 10); - test_str(varbuf_rollback_start(&vbs), ==, "1234567890"); + test_str(varbuf_rollback_end(&vbs), ==, "1234567890"); varbuf_rollback(&vbs); test_pass(vb.used == 0); test_pass(varbuf_rollback_len(&vbs) == 0); - test_str(varbuf_rollback_start(&vbs), ==, ""); + test_str(varbuf_rollback_end(&vbs), ==, ""); varbuf_add_buf(&vb, "1234567890", 10); test_pass(vb.used == 10); test_pass(varbuf_rollback_len(&vbs) == 10); - test_str(varbuf_rollback_start(&vbs), ==, "1234567890"); + test_str(varbuf_rollback_end(&vbs), ==, "1234567890"); varbuf_snapshot(&vb, &vbs); test_pass(vb.used == 10); test_pass(varbuf_rollback_len(&vbs) == 0); - test_str(varbuf_rollback_start(&vbs), ==, ""); + test_str(varbuf_rollback_end(&vbs), ==, ""); varbuf_add_buf(&vb, "1234567890", 10); test_pass(vb.used == 20); test_pass(varbuf_rollback_len(&vbs) == 10); - test_str(varbuf_rollback_start(&vbs), ==, "1234567890"); + test_str(varbuf_rollback_end(&vbs), ==, "1234567890"); varbuf_rollback(&vbs); test_pass(vb.used == 10); test_pass(varbuf_rollback_len(&vbs) == 0); - test_str(varbuf_rollback_start(&vbs), ==, ""); + test_str(varbuf_rollback_end(&vbs), ==, ""); varbuf_destroy(&vb); } diff --git a/lib/dpkg/varbuf.c b/lib/dpkg/varbuf.c index 5829a6f78..e548f3dab 100644 --- a/lib/dpkg/varbuf.c +++ b/lib/dpkg/varbuf.c @@ -294,7 +294,7 @@ varbuf_rollback_len(struct varbuf_state *vs) } const char * -varbuf_rollback_start(struct varbuf_state *vs) +varbuf_rollback_end(struct varbuf_state *vs) { if (vs->v->buf == NULL) { if (vs->used) diff --git a/lib/dpkg/varbuf.h b/lib/dpkg/varbuf.h index 2a4da2b4d..ca22669c5 100644 --- a/lib/dpkg/varbuf.h +++ b/lib/dpkg/varbuf.h @@ -117,7 +117,7 @@ struct varbuf_state { void varbuf_snapshot(struct varbuf *v, struct varbuf_state *vs); void varbuf_rollback(struct varbuf_state *vs); size_t varbuf_rollback_len(struct varbuf_state *vs); -const char *varbuf_rollback_start(struct varbuf_state *vs); +const char *varbuf_rollback_end(struct varbuf_state *vs); /** @} */ -- Dpkg.Org's dpkg
