Remove some code duplication, check for realloc failure.

[project/opkg-lede.git] / libopkg / pkg_vec.c

diff --git a/libopkg/pkg_vec.c b/libopkg/pkg_vec.c
index 294571f0f93dd634cc814ea5aa013159b8a14d75..fa2c2373d840b0dd79cb91793af84c3a6dba951b 100644 (file)
--- a/libopkg/pkg_vec.c
+++ b/libopkg/pkg_vec.c
@@ -1,4 +1,4 @@
-/* pkg_vec.c - the itsy package management system
+/* pkg_vec.c - the opkg package management system
 
    Steven M. Ayer
    
@@ -23,7 +23,7 @@
 
 pkg_vec_t * pkg_vec_alloc(void)
 {
-    pkg_vec_t * vec = (pkg_vec_t *)malloc(sizeof(pkg_vec_t));
+    pkg_vec_t * vec = (pkg_vec_t *)calloc(1, sizeof(pkg_vec_t));
     if (!vec) {
       fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
       return NULL;
@@ -36,7 +36,12 @@ pkg_vec_t * pkg_vec_alloc(void)
 
 void pkg_vec_free(pkg_vec_t *vec)
 {
-    free(vec->pkgs);
+    if (!vec)
+      return;
+
+    if (vec->pkgs)
+      free(vec->pkgs);
+
     free(vec);
 }
 
@@ -68,12 +73,9 @@ pkg_t *pkg_vec_insert_merge(pkg_vec_t *vec, pkg_t *pkg, int set_status,opkg_conf
 
      /* we didn't find one, add it */
      if (!found){   
-         opkg_message(conf, OPKG_DEBUG2, "Function: %s. Adding new pkg=%s version=%s arch=%s\n",
+          opkg_message(conf, OPKG_DEBUG2, "Function: %s. Adding new pkg=%s version=%s arch=%s\n",
                       __FUNCTION__, pkg->name, pkg->version, pkg->architecture);
-
-         vec->pkgs = (pkg_t **)realloc(vec->pkgs, (vec->len + 1) * sizeof(pkg_t *));
-         vec->pkgs[vec->len] = pkg;
-         vec->len++;
+          pkg_vec_insert(vec, pkg);
          return pkg;
      }
      /* update the one that we have */
@@ -101,25 +103,15 @@ pkg_t *pkg_vec_insert_merge(pkg_vec_t *vec, pkg_t *pkg, int set_status,opkg_conf
 
 void pkg_vec_insert(pkg_vec_t *vec, const pkg_t *pkg)
 {
-     int found = 0;
-
-#if 0
-     /* look for a duplicate pkg by name, version, and architecture */
-     for (i = 0; i < vec->len; i++)
-         if ((strcmp(pkg->name, vec->pkgs[i]->name) == 0)
-             && (pkg_compare_versions(pkg, vec->pkgs[i]) == 0)
-             && (strcmp(pkg->architecture, vec->pkgs[i]->name) == 0)) {
-              found = 1;
-              break;
-         }
-#endif
-
-     /* we didn't find one, add it */
-     if(!found){   
-         vec->pkgs = (pkg_t **)realloc(vec->pkgs, (vec->len + 1) * sizeof(pkg_t *));
-         *(const pkg_t **)&vec->pkgs[vec->len] = pkg;
-         vec->len++;
-     }
+    pkg_t **tmp;
+    tmp = realloc(vec->pkgs, (vec->len + 1) * sizeof(pkg_t *));
+    if (tmp == NULL) {
+        fprintf(stderr, "%s: %s\n", __FUNCTION__, strerror(errno));
+       return;
+    }
+    vec->pkgs = tmp;
+    vec->pkgs[vec->len] = (pkg_t *)pkg;
+    vec->len++;
 }
 
 int pkg_vec_contains(pkg_vec_t *vec, pkg_t *apkg)
@@ -167,7 +159,7 @@ int pkg_vec_mark_if_matches(pkg_vec_t *vec, const char *pattern)
 abstract_pkg_vec_t * abstract_pkg_vec_alloc(void)
 {
     abstract_pkg_vec_t * vec ; 
-    vec = (abstract_pkg_vec_t *)malloc(sizeof(abstract_pkg_vec_t));
+    vec = (abstract_pkg_vec_t *)calloc(1, sizeof(abstract_pkg_vec_t));
     if (!vec) {
       fprintf(stderr, "%s: out of memory\n", __FUNCTION__);
       return NULL;
@@ -180,6 +172,8 @@ abstract_pkg_vec_t * abstract_pkg_vec_alloc(void)
 
 void abstract_pkg_vec_free(abstract_pkg_vec_t *vec)
 {
+    if (!vec)
+      return;
     free(vec->pkgs);
     free(vec);
 }
@@ -189,24 +183,15 @@ void abstract_pkg_vec_free(abstract_pkg_vec_t *vec)
  */
 void abstract_pkg_vec_insert(abstract_pkg_vec_t *vec, abstract_pkg_t *pkg)
 {
-
-#if 0
-    /* look for a duplicate pkg by name */
-    for(i = 0; i < vec->len; i++)
-       if (strcmp(pkg->name, vec->pkgs[i]->name) == 0)
-           break;
-
-    /* we didn't find one, add it */
-    if(i == vec->len){   
-#endif
-       vec->pkgs = 
-         (abstract_pkg_t **)
-           realloc(vec->pkgs, (vec->len + 1) * sizeof(abstract_pkg_t *));
-       vec->pkgs[vec->len] = pkg;
-       vec->len++;
-#if 0
+    abstract_pkg_t **tmp;
+    tmp = realloc(vec->pkgs, (vec->len + 1) * sizeof(abstract_pkg_t *));
+    if (tmp == NULL) {
+        fprintf(stderr, "%s: %s\n", __FUNCTION__, strerror(errno));
+       return;
     }
-#endif
+    vec->pkgs = tmp;
+    vec->pkgs[vec->len] = pkg;
+    vec->len++;
 }
 
 abstract_pkg_t * abstract_pkg_vec_get(abstract_pkg_vec_t *vec, int i)
@@ -231,3 +216,14 @@ void abstract_pkg_vec_sort(pkg_vec_t *vec, compare_fcn_t compar)
      qsort(vec->pkgs, vec->len, sizeof(pkg_t *), compar);
 }
 
+int pkg_compare_names(const void *p1, const void *p2)
+{
+  const pkg_t *pkg1 = *(const pkg_t **)p1;
+  const pkg_t *pkg2 = *(const pkg_t **)p2;
+  if (pkg1->name == NULL)
+    return 1;
+  if (pkg2->name == NULL)
+    return -1;
+  return(strcmp(pkg1->name, pkg2->name));
+}
+