Make a couple of functions static, and return void since they cannot fail.

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

diff --git a/libopkg/pkg.h b/libopkg/pkg.h
index e7239f13311b9c78ca9aa6302ef523deb0eb39ec..328d4791ed83f02afea705626e391b0814be7b03 100644 (file)
--- a/libopkg/pkg.h
+++ b/libopkg/pkg.h
@@ -24,6 +24,7 @@
 
 #include "pkg_vec.h"
 #include "str_list.h"
+#include "active_list.h"
 #include "pkg_src.h"
 #include "pkg_dest.h"
 #include "opkg_conf.h"
@@ -135,6 +136,7 @@ struct pkg
      int recommends_count;
      char **suggests_str;
      int suggests_count;
+     struct active_list list; /* Used for installing|upgrading */
      compound_depend_t * depends;
 
      /* Abhaya: new conflicts */
@@ -159,6 +161,9 @@ struct pkg
      char *url;
      char *tmp_unpack_dir;
      char *md5sum;
+#if defined HAVE_SHA256
+     char *sha256sum;
+#endif
      char *size;
      char *installed_size;
      char *priority;
@@ -183,11 +188,9 @@ struct pkg
 };
 
 pkg_t *pkg_new(void);
-int pkg_init(pkg_t *pkg);
 void pkg_deinit(pkg_t *pkg);
-int pkg_init_from_file(pkg_t *pkg, const char *filename);
+int pkg_init_from_file(opkg_conf_t *conf, pkg_t *pkg, const char *filename);
 abstract_pkg_t *abstract_pkg_new(void);
-int abstract_pkg_init(abstract_pkg_t *ab_pkg);
 
 /* 
  * merges fields from newpkg into oldpkg.
@@ -201,15 +204,13 @@ int pkg_compare_versions(const pkg_t *pkg, const pkg_t *ref_pkg);
 int pkg_name_version_and_architecture_compare(const void *a, const void *b);
 int abstract_pkg_name_compare(const void *a, const void *b);
 
-char * pkg_formatted_info(pkg_t *pkg );
-char * pkg_formatted_field(pkg_t *pkg, const char *field );
+void pkg_formatted_info(FILE *fp, pkg_t *pkg);
+void pkg_formatted_field(FILE *fp, pkg_t *pkg, const char *field);
 
 void set_flags_from_control(opkg_conf_t *conf, pkg_t *pkg);
 
-void pkg_print_info(pkg_t *pkg, FILE *file);
 void pkg_print_status(pkg_t * pkg, FILE * file);
-void pkg_print_field(pkg_t *pkg, FILE *file, const char *field);
-str_list_t *pkg_get_installed_files(pkg_t *pkg);
+str_list_t *pkg_get_installed_files(opkg_conf_t *conf, pkg_t *pkg);
 int pkg_free_installed_files(pkg_t *pkg);
 int pkg_remove_installed_files_list(opkg_conf_t *conf, pkg_t *pkg);
 conffile_t *pkg_get_conffile(pkg_t *pkg, const char *file_name);