The following commit has been merged in the master branch:
commit a30303a4ea49c548673544d09f667802be7c9b26
Author: Guillem Jover <[email protected]>
Date: Mon Nov 1 20:19:37 2010 +0100
libdpkg: Rename nameLength to name_len in tar_extractor()
diff --git a/lib/dpkg/tarfn.c b/lib/dpkg/tarfn.c
index 0817c88..92a8edb 100644
--- a/lib/dpkg/tarfn.c
+++ b/lib/dpkg/tarfn.c
@@ -249,7 +249,7 @@ tar_extractor(void *ctx, const struct tar_operations *ops)
h.linkname = NULL;
while ((status = ops->read(ctx, buffer, TARBLKSZ)) == TARBLKSZ) {
- int nameLength;
+ int name_len;
if (!DecodeTarHeader(buffer, &h)) {
if (h.name[0] == '\0') {
@@ -282,19 +282,19 @@ tar_extractor(void *ctx, const struct tar_operations *ops)
break;
}
- nameLength = strlen(h.name);
+ name_len = strlen(h.name);
switch (h.type) {
case tar_filetype_file:
/* Compatibility with pre-ANSI ustar. */
- if (h.name[nameLength - 1] != '/') {
+ if (h.name[name_len - 1] != '/') {
status = ops->extract_file(ctx, &h);
break;
}
/* Else, fall through. */
case tar_filetype_dir:
- if (h.name[nameLength - 1] == '/') {
- h.name[nameLength - 1] = '\0';
+ if (h.name[name_len - 1] == '/') {
+ h.name[name_len - 1] = '\0';
}
status = ops->mkdir(ctx, &h);
break;
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
