Changeset 4448

Timestamp:

05/22/08 11:24:48 (5 years ago)

Author:

thomas

Message:

opkg: remove redundant multiple_providers option and also remove redundant familiar_revision pointer from the pkg struct

Location:

trunk/src/target/opkg/libopkg

Files:

• opkg.c (modified) (1 diff)
• opkg_cmd.c (modified) (1 diff)
• opkg_conf.c (modified) (3 diffs)
• opkg_conf.h (modified) (1 diff)
• pkg.c (modified) (2 diffs)
• pkg.h (modified) (1 diff)
• pkg_parse.c (modified) (2 diffs)

trunk/src/target/opkg/libopkg/opkg.c

@@ -236 +236 @@
   a->noaction = c->noaction;
   a->query_all = c->query_all;
-  a->multiple_providers = c->multiple_providers;
   a->verbosity = c->verbosity;
 

trunk/src/target/opkg/libopkg/opkg_cmd.c

@@ -591 +591 @@
      for (i=0; i < argc; i++) {
           arg = argv[i];
-          if (conf->multiple_providers)
-               err = opkg_install_multi_by_name(conf, arg);
-          else{
-               err = opkg_install_by_name(conf, arg);
-          }
+          err = opkg_install_by_name(conf, arg);
           if (err == OPKG_PKG_HAS_NO_CANDIDATE) {
                opkg_message(conf, OPKG_ERROR,

trunk/src/target/opkg/libopkg/opkg_conf.c

@@ -54 +54 @@
           { "ftp_proxy", OPKG_OPT_TYPE_STRING, &conf->ftp_proxy },
           { "http_proxy", OPKG_OPT_TYPE_STRING, &conf->http_proxy },
-          { "multiple_providers", OPKG_OPT_TYPE_BOOL, &conf->multiple_providers },
           { "no_proxy", OPKG_OPT_TYPE_STRING, &conf->no_proxy },
           { "test", OPKG_OPT_TYPE_INT, &conf->noaction },
@@ -146 +145 @@
      conf->offline_root_pre_script_cmd = NULL;
      conf->offline_root_post_script_cmd = NULL;
-     conf->multiple_providers = 0;
      conf->verbosity = 1;
      conf->noaction = 0;
@@ -264 +262 @@
      if (args->query_all) {
           conf->query_all = 1;
-     }
-     if (args->multiple_providers) {
-          conf->multiple_providers = 1;
      }
      if (args->verbosity != conf->verbosity) {

trunk/src/target/opkg/libopkg/opkg_conf.h

@@ -64 +64 @@
      int force_removal_of_essential_packages;
      int nodeps; /* do not follow dependences */
-     int multiple_providers;
      char *offline_root;
      char *offline_root_pre_script_cmd;

trunk/src/target/opkg/libopkg/pkg.c

@@ -95 +95 @@
      pkg->version = NULL;
      pkg->revision = NULL;
-     pkg->familiar_revision = NULL;
      pkg->dest = NULL;
      pkg->src = NULL;
@@ -165 +164 @@
      free(pkg->version);
      pkg->version = NULL;
-     /* revision and familiar_revision share storage with version, so
+     /* revision shares storage with version, so
         don't free */
      pkg->revision = NULL;
-     pkg->familiar_revision = NULL;
      /* owned by opkg_conf_t */
      pkg->dest = NULL;

trunk/src/target/opkg/libopkg/pkg.h

@@ -118 +118 @@
      char *version;
      char *revision;
-     char *familiar_revision;
      pkg_src_t *src;
      pkg_dest_t *dest;

trunk/src/target/opkg/libopkg/pkg_parse.c

@@ -139 +139 @@
 
   pkg->revision = "";
-  pkg->familiar_revision = "";
 
   if (!pkg->version)
@@ -158 +157 @@
   }
 
-/*
-  fprintf(stderr,"Parsed version: %lu, %s, %s, %s\n",
-          pkg->epoch,
-          pkg->version,
-          pkg->revision,
-          pkg->familiar_revision);
-*/
-          
   return 0;
 }