summaryrefslogtreecommitdiff
path: root/src/unpack.c
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2014-06-01 01:11:19 +0200
committerGuillem Jover <guillem@debian.org>2014-10-06 00:27:21 +0200
commit4c65eaf4a1e9692f48d680a366e2fa91cca0a116 (patch)
tree86bd9e4f73c0eedddfddc46162daf31701c42c6c /src/unpack.c
parent2db3d929026f2512dc4a1358a099bcd82b556beb (diff)
downloaddpkg-4c65eaf4a1e9692f48d680a366e2fa91cca0a116.tar.gz
dpkg: Remove static from pointer variables
These were supposedly static to cater to the push_cleanup() needs, but as these are pointers they are unaffected by an unrolled stack.
Diffstat (limited to 'src/unpack.c')
-rw-r--r--src/unpack.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/unpack.c b/src/unpack.c
index 851c358c6..591573678 100644
--- a/src/unpack.c
+++ b/src/unpack.c
@@ -409,8 +409,6 @@ void process_archive(const char *filename) {
* we unwind the stack before processing the cleanup list, and these
* variables had better still exist ... */
static int p1[2];
- static char *cidir = NULL;
- static struct fileinlist *newconffiles, *newfileslist;
static enum pkgstatus oldversionstatus;
static struct varbuf depprobwhy;
static struct tarcontext tc;
@@ -422,10 +420,13 @@ void process_archive(const char *filename) {
struct pkgiterator *it;
struct pkginfo *pkg, *otherpkg;
struct pkg_list *conflictor_iter;
+ char *cidir = NULL;
char *cidirrest, *p;
char conffilenamebuf[MAXCONFFILENAME];
char *psize;
const char *pfilename;
+ struct fileinlist *newfileslist;
+ struct fileinlist *newconffiles;
struct fileinlist *newconff, **newconffileslastp;
struct fileinlist *cfile;
struct reversefilelistiter rlistit;