opkg: remove verbose_wget option

[oweals/opkg-lede.git] / libopkg / opkg_conf.c

diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c
index 8cda3216dace84a32269b68dc39555611cc4587d..e2cbae5997da02be275c897d7ae694e52c55f409 100644 (file)
--- a/libopkg/opkg_conf.c
+++ b/libopkg/opkg_conf.c
@@ -1,4 +1,4 @@
-/* opkg_conf.c - the itsy package management system
+/* opkg_conf.c - the opkg package management system
 
    Carl D. Worth
 
@@ -15,9 +15,7 @@
    General Public License for more details.
 */
 
-#include <glob.h>
-
-#include "opkg.h"
+#include "includes.h"
 #include "opkg_conf.h"
 
 #include "xregex.h"
@@ -27,12 +25,14 @@
 #include "file_util.h"
 #include "str_util.h"
 #include "xsystem.h"
+#include <glob.h>
+#include "opkg_defines.h"
+
 
 static int opkg_conf_parse_file(opkg_conf_t *conf, const char *filename,
                                pkg_src_list_t *pkg_src_list,
                                nv_pair_list_t *tmp_dest_nv_pair_list,
                                char **tmp_lists_dir);
-static int opkg_init_options_array(const opkg_conf_t *conf, opkg_option_t **options);
 static int opkg_conf_set_option(const opkg_option_t *options,
                                const char *name, const char *value);
 static int opkg_conf_set_default_dest(opkg_conf_t *conf,
@@ -64,7 +64,6 @@ int opkg_init_options_array(const opkg_conf_t *conf, opkg_option_t **options)
          { "proxy_passwd", OPKG_OPT_TYPE_STRING, &conf->proxy_passwd },
          { "proxy_user", OPKG_OPT_TYPE_STRING, &conf->proxy_user },
          { "query-all", OPKG_OPT_TYPE_BOOL, &conf->query_all },
-         { "verbose-wget", OPKG_OPT_TYPE_BOOL, &conf->verbose_wget },
          { "verbosity", OPKG_OPT_TYPE_BOOL, &conf->verbosity },
          { NULL }
      };
@@ -143,7 +142,6 @@ int opkg_conf_init(opkg_conf_t *conf, const args_t *args)
      conf->force_removal_of_essential_packages = 0;
      conf->force_removal_of_dependent_packages = 0;
      conf->nodeps = 0;
-     conf->verbose_wget = 0;
      conf->offline_root = NULL;
      conf->offline_root_pre_script_cmd = NULL;
      conf->offline_root_post_script_cmd = NULL;
@@ -264,9 +262,6 @@ int opkg_conf_init(opkg_conf_t *conf, const args_t *args)
      if (args->query_all) {
          conf->query_all = 1;
      }
-     if (args->verbose_wget) {
-         conf->verbose_wget = 1;
-     }
      if (args->multiple_providers) {
          conf->multiple_providers = 1;
      }