diff options
author | Guillem Jover <guillem@debian.org> | 2010-07-28 16:03:02 +0200 |
---|---|---|
committer | Guillem Jover <guillem@debian.org> | 2010-07-29 10:28:38 +0200 |
commit | f8a9cacf8ada2dc14dcf86f34969f2f5b678bdee (patch) | |
tree | 3ea132b901923aaa2366cfbecbadd7cbc65b136a /src/filters.c | |
parent | 646892a232557410f8036b9d06a2babcbb44456d (diff) | |
download | dpkg-f8a9cacf8ada2dc14dcf86f34969f2f5b678bdee.tar.gz |
libdpkg: Rename and lower-case TarInfo members
Diffstat (limited to 'src/filters.c')
-rw-r--r-- | src/filters.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/filters.c b/src/filters.c index 8bac329c0..72687f76c 100644 --- a/src/filters.c +++ b/src/filters.c @@ -72,17 +72,17 @@ filter_should_skip(struct TarInfo *ti) /* Last match wins. */ for (f = filter_head; f != NULL; f = f->next) { debug(dbg_eachfile, "filter comparing '%s' and '%s'", - &ti->Name[1], f->pattern); + &ti->name[1], f->pattern); - if (fnmatch(f->pattern, &ti->Name[1], 0) == 0) { + if (fnmatch(f->pattern, &ti->name[1], 0) == 0) { if (f->include) { skip = false; debug(dbg_eachfile, "filter including %s", - ti->Name); + ti->name); } else { skip = true; debug(dbg_eachfile, "filter removing %s", - ti->Name); + ti->name); } } } @@ -93,11 +93,11 @@ filter_should_skip(struct TarInfo *ti) * directories than necessary, but better err on the side of caution * than failing with “no such file or directory” (which would leave * the package in a very bad state). */ - if (skip && (ti->Type == tar_filetype_dir || - ti->Type == tar_filetype_symlink)) { + if (skip && (ti->type == tar_filetype_dir || + ti->type == tar_filetype_symlink)) { debug(dbg_eachfile, "filter seeing if '%s' needs to be reincluded", - &ti->Name[1]); + &ti->name[1]); for (f = filter_head; f != NULL; f = f->next) { const char *wildcard; @@ -117,9 +117,9 @@ filter_should_skip(struct TarInfo *ti) debug(dbg_eachfiledetail, "filter subpattern '%*.s'", path_len, f->pattern); - if (strncmp(&ti->Name[1], f->pattern, path_len) == 0) { + if (strncmp(&ti->name[1], f->pattern, path_len) == 0) { debug(dbg_eachfile, "filter reincluding %s", - ti->Name); + ti->name); return false; } } |