varbuf(v)printf now return the number of characters they added to the

buffer.

diff --git a/ChangeLog b/ChangeLog
index 7b50c6cce59e706b2008026025cb831ebc203a2a..53f585f0163dbdbde7ed5197495f8823fe953ea4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jan  5 22:25:06 CST 2001 Adam Heath <doogie@debian.org>
+
+  * lib/varbuf.c: varbuf(v)printf now return the number of characters
+    they added to the buffer.
+
 Thu Jan  4 01:20:27 CST 2001 Adam Heath <doogie@debian.org>
 
   * dpkg-deb/build.c, dpkg-deb/extract.c, dpkg-deb/info.c,

diff --git a/include/dpkg-db.h b/include/dpkg-db.h
index bece2d0450d4b7c0561ace620bce1975fce716a9..3d272ab1fe401738725c443edb1856a54eaa791a 100644 (file)
--- a/include/dpkg-db.h
+++ b/include/dpkg-db.h
@@ -226,6 +226,8 @@ struct varbuf;
 
 extern void varbufaddc(struct varbuf *v, int c);
 extern void varbufdupc(struct varbuf *v, int c, ssize_t s);
+int varbufprintf(struct varbuf *v, const char *fmt, ...) PRINTFFORMAT(2,3);
+int varbufvprintf(struct varbuf *v, const char *fmt, va_list va);
 void varbufinit(struct varbuf *v);
 void varbufreset(struct varbuf *v);
 void varbufextend(struct varbuf *v);
@@ -285,8 +287,6 @@ void writedb(const char *filename, int available, int mustsync);
 
 void varbufrecord(struct varbuf*, const struct pkginfo*, const struct pkginfoperfile*);
 void varbufdependency(struct varbuf *vb, struct dependency *dep);
-void varbufprintf(struct varbuf *v, const char *fmt, ...) PRINTFFORMAT(2,3);
-void varbufvprintf(struct varbuf *v, const char *fmt, va_list va);
   /* NB THE VARBUF MUST HAVE BEEN INITIALISED AND WILL NOT BE NULL-TERMINATED */
 
 /*** from vercmp.c ***/

diff --git a/lib/varbuf.c b/lib/varbuf.c
index ed33837b76fdcadbeca9c9cf964b6a4225fe54f9..0092bdda8eb5784f2879fb497df51a81dc5f5359 100644 (file)
--- a/lib/varbuf.c
+++ b/lib/varbuf.c
@@ -43,7 +43,7 @@ void varbufdupc(struct varbuf *v, int c, ssize_t n) {
   }
 }
 
-void varbufprintf(struct varbuf *v, const char *fmt, ...) {
+int varbufprintf(struct varbuf *v, const char *fmt, ...) {
   int ou, r;
   va_list al;
 
@@ -58,9 +58,10 @@ void varbufprintf(struct varbuf *v, const char *fmt, ...) {
     if (r < 0) r= (v->size-ou+1) * 2;
     v->used= ou+r;
   } while (r >= v->size-ou-1);
+  return r;
 }
 
-void varbufvprintf(struct varbuf *v, const char *fmt, va_list va) {
+int varbufvprintf(struct varbuf *v, const char *fmt, va_list va) {
   int ou, r;
   va_list al;
 
@@ -74,6 +75,7 @@ void varbufvprintf(struct varbuf *v, const char *fmt, va_list va) {
     if (r < 0) r= (v->size-ou+1) * 2;
     v->used= ou+r;
   } while (r >= v->size-ou-1);
+  return r;
 }
 
 void varbufaddbuf(struct varbuf *v, const void *s, const int l) {