Remove unused parameter from pkg_hash_fetch_best_installation_candidate().

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

diff --git a/libopkg/opkg_cmd.c b/libopkg/opkg_cmd.c
index c9489d309b2f21429356dc4608327ae4141d506e..ca9d9c930ea7f0a099c112eccbc6ab637d82c1f5 100644 (file)
--- a/libopkg/opkg_cmd.c
+++ b/libopkg/opkg_cmd.c
@@ -546,10 +546,8 @@ static int opkg_install_cmd(opkg_conf_t *conf, int argc, char **argv)
      for (i=0; i < argc; i++) {
          arg = argv[i];
           err = opkg_install_by_name(conf, arg);
-         if (err == OPKG_PKG_HAS_NO_CANDIDATE) {
-              opkg_message(conf, OPKG_ERROR,
-                           "Cannot find package %s.\n",
-                           arg);
+         if (err) {
+              opkg_message(conf, OPKG_ERROR, "Cannot find package %s.\n", arg);
          }
      }
 
@@ -631,7 +629,7 @@ static int opkg_download_cmd(opkg_conf_t *conf, int argc, char **argv)
      for (i = 0; i < argc; i++) {
          arg = argv[i];
 
-         pkg = pkg_hash_fetch_best_installation_candidate_by_name(conf, arg, &err);
+         pkg = pkg_hash_fetch_best_installation_candidate_by_name(conf, arg);
          if (pkg == NULL) {
               opkg_message(conf, OPKG_ERROR,
                            "Cannot find package %s.\n"
@@ -716,7 +714,9 @@ static int opkg_list_upgradable_cmd(opkg_conf_t *conf, int argc, char **argv)
     char *old_v, *new_v;
     for (node = active_list_next(head, head); node;node = active_list_next(head,node)) {
         _old_pkg = list_entry(node, pkg_t, list);
-        _new_pkg = pkg_hash_fetch_best_installation_candidate_by_name(conf, _old_pkg->name, NULL);
+        _new_pkg = pkg_hash_fetch_best_installation_candidate_by_name(conf, _old_pkg->name);
+       if (_new_pkg == NULL)
+               continue;
         old_v = pkg_version_str_alloc(_old_pkg);
         new_v = pkg_version_str_alloc(_new_pkg);
         printf("%s - %s - %s\n", _old_pkg->name, old_v, new_v);