pkg: coalesce soem flag members into a packed bit field

[oweals/opkg-lede.git] / libopkg / pkg_vec.h

diff --git a/libopkg/pkg_vec.h b/libopkg/pkg_vec.h
index 2bc1631f44a218901e5517a0920d1b74351232fc..876455a6b03aad1b4229ae85c2dd21c2e471fd93 100644 (file)
--- a/libopkg/pkg_vec.h
+++ b/libopkg/pkg_vec.h
@@ -1,7 +1,7 @@
-/* pkg_vec.h - the itsy package management system
+/* pkg_vec.h - the opkg package management system
 
    Steven M. Ayer
-   
+
    Copyright (C) 2002 Compaq Computer Corporation
 
    This program is free software; you can redistribute it and/or
@@ -20,43 +20,40 @@
 
 typedef struct pkg pkg_t;
 typedef struct abstract_pkg abstract_pkg_t;
+typedef struct pkg_vec pkg_vec_t;
+typedef struct abstract_pkg_vec abstract_pkg_vec_t;
 
-struct pkg_vec
-{
-    pkg_t **pkgs;
-    int len;
+#include "opkg_conf.h"
+
+struct pkg_vec {
+       pkg_t **pkgs;
+       unsigned int len;
 };
-typedef struct pkg_vec pkg_vec_t;
 
-struct abstract_pkg_vec
-{
-    abstract_pkg_t **pkgs;
-    int len;
+struct abstract_pkg_vec {
+       abstract_pkg_t **pkgs;
+       unsigned int len;
 };
-typedef struct abstract_pkg_vec abstract_pkg_vec_t;
 
+pkg_vec_t *pkg_vec_alloc(void);
+void pkg_vec_free(pkg_vec_t * vec);
 
-pkg_vec_t * pkg_vec_alloc(void);
-void pkg_vec_free(pkg_vec_t *vec);
-void marry_two_packages(pkg_t * newpkg, pkg_t * oldpkg);
-
-void pkg_vec_add(pkg_vec_t *vec, pkg_t *pkg);
-/* pkg_vec_insert_merge: might munge pkg.
-*  returns the pkg that is in the pkg graph */
-pkg_t *pkg_vec_insert_merge(pkg_vec_t *vec, pkg_t *pkg, int set_status, opkg_conf_t *conf);
-/* this one never munges pkg */
-void pkg_vec_insert(pkg_vec_t *vec, const pkg_t *pkg);
-int pkg_vec_contains(pkg_vec_t *vec, pkg_t *apkg);
-void pkg_vec_sort(pkg_vec_t *vec, int (*compar)(pkg_t *, pkg_t *));
-
-int pkg_vec_clear_marks(pkg_vec_t *vec);
-int pkg_vec_mark_if_matches(pkg_vec_t *vec, const char *pattern);
-
-abstract_pkg_vec_t * abstract_pkg_vec_alloc(void);
-void abstract_pkg_vec_free(abstract_pkg_vec_t *vec);
-void abstract_pkg_vec_insert(abstract_pkg_vec_t *vec, abstract_pkg_t *pkg);
-abstract_pkg_t * abstract_pkg_vec_get(abstract_pkg_vec_t *vec, int i);
-int abstract_pkg_vec_contains(abstract_pkg_vec_t *vec, abstract_pkg_t *apkg);
-void abstract_pkg_vec_sort(pkg_vec_t *vec, int (*compar)(abstract_pkg_t *, abstract_pkg_t *));
-#endif
+void pkg_vec_insert_merge(pkg_vec_t * vec, pkg_t * pkg, int set_status);
+void pkg_vec_insert(pkg_vec_t * vec, const pkg_t * pkg);
+int pkg_vec_contains(pkg_vec_t * vec, pkg_t * apkg);
+
+typedef int (*compare_fcn_t) (const void *, const void *);
+void pkg_vec_sort(pkg_vec_t * vec, compare_fcn_t compar);
+
+int pkg_vec_clear_marks(pkg_vec_t * vec);
+int pkg_vec_mark_if_matches(pkg_vec_t * vec, const char *pattern);
 
+abstract_pkg_vec_t *abstract_pkg_vec_alloc(void);
+void abstract_pkg_vec_free(abstract_pkg_vec_t * vec);
+void abstract_pkg_vec_insert(abstract_pkg_vec_t * vec, abstract_pkg_t * pkg);
+abstract_pkg_t *abstract_pkg_vec_get(abstract_pkg_vec_t * vec, int i);
+int abstract_pkg_vec_contains(abstract_pkg_vec_t * vec, abstract_pkg_t * apkg);
+void abstract_pkg_vec_sort(pkg_vec_t * vec, compare_fcn_t compar);
+
+int pkg_compare_names(const void *p1, const void *p2);
+#endif