Don't mask variable of wider scope.

git-svn-id: http://opkg.googlecode.com/svn/trunk@493 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358

diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c
index d773c16828e3dfaa6064e78cd0203d0caa262f76..a29666c0ede1343a4863cdad58a527eb4f2c664c 100644 (file)
--- a/libopkg/opkg_conf.c
+++ b/libopkg/opkg_conf.c
@@ -34,7 +34,7 @@
 #include <glob.h>
 
 static int lock_fd;
 #include <glob.h>
 
 static int lock_fd;

-char *lock_file;
+static char *lock_file = NULL;

 
 static opkg_conf_t _conf;
 opkg_conf_t *conf = &_conf;
 
 static opkg_conf_t _conf;
 opkg_conf_t *conf = &_conf;


@@ -398,7 +398,6 @@ opkg_conf_init(void)
        int i;
        char *tmp, *tmp_dir_base, **tmp_val;
        nv_pair_list_t tmp_dest_nv_pair_list;
        int i;
        char *tmp, *tmp_dir_base, **tmp_val;
        nv_pair_list_t tmp_dest_nv_pair_list;

-       char *lock_file = NULL;

        glob_t globbuf;
        char *etc_opkg_conf_pattern;
 
        glob_t globbuf;
        char *etc_opkg_conf_pattern;