The following commit has been merged in the master branch:
commit 8a8056b7adc60e7d944ff45f0d00080796136982
Author: Guillem Jover <[email protected]>
Date: Tue Jan 20 01:21:54 2009 +0200
libdpkg: Rename function arguments named l to size
diff --git a/ChangeLog b/ChangeLog
index 82859e7..7f9edd6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2009-01-20 Guillem Jover <[email protected]>
+ * lib/dpkg-db.h (varbufaddbuf): Rename argument l to size.
+ * lib/nfmalloc.c (nfstrnsave): Likewise.
+ * lib/varbuf.c (varbufaddbuf): Likewise.
+
+2009-01-20 Guillem Jover <[email protected]>
+
* lib/dpkg-db.h (varbufdupc): Use size_t instead of ssize_t.
(varbufaddbuf): Use size_t instead of const int.
(nfstrnsave): Use size_t instead of int.
diff --git a/lib/dpkg-db.h b/lib/dpkg-db.h
index c9c7489..7ed8d7b 100644
--- a/lib/dpkg-db.h
+++ b/lib/dpkg-db.h
@@ -387,7 +387,7 @@ void varbufreset(struct varbuf *v);
void varbufextend(struct varbuf *v);
void varbuffree(struct varbuf *v);
#define varbufaddstr(v, s) varbufaddbuf(v, s, strlen(s))
-extern void varbufaddbuf(struct varbuf *v, const void *s, size_t l);
+extern void varbufaddbuf(struct varbuf *v, const void *s, size_t size);
/* varbufinit must be called exactly once before the use of each varbuf
* (including before any call to varbuffree), or the variable must be
diff --git a/lib/nfmalloc.c b/lib/nfmalloc.c
index 5449edd..a471580 100644
--- a/lib/nfmalloc.c
+++ b/lib/nfmalloc.c
@@ -61,10 +61,10 @@ char *nfstrsave(const char *string) {
}
char *
-nfstrnsave(const char *string, size_t l)
+nfstrnsave(const char *string, size_t size)
{
OBSTACK_INIT;
- return obstack_copy0 (&db_obs, string, l);
+ return obstack_copy0(&db_obs, string, size);
}
void nffreeall(void) {
diff --git a/lib/varbuf.c b/lib/varbuf.c
index eecdd45..5ab780e 100644
--- a/lib/varbuf.c
+++ b/lib/varbuf.c
@@ -77,13 +77,13 @@ int varbufvprintf(struct varbuf *v, const char *fmt,
va_list va) {
}
void
-varbufaddbuf(struct varbuf *v, const void *s, size_t l)
+varbufaddbuf(struct varbuf *v, const void *s, size_t size)
{
int ou;
ou= v->used;
- v->used += l;
+ v->used += size;
if (v->used >= v->size) varbufextend(v);
- memcpy(v->buf + ou, s, l);
+ memcpy(v->buf + ou, s, size);
}
void
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
