X-Git-Url: https://git.librecmc.org/?p=oweals%2Fopkg-lede.git;a=blobdiff_plain;f=libopkg%2Fopkg.h;h=9cb977e143366b1b81b8969bd324f1ef6a8ed8a1;hp=970590c64ea60f6af534b41981030f1b0a3bc220;hb=5cec98121cd85b63fcd80169a9f51fbf1f9da980;hpb=6a36527ec6863a6fe0f4019691fe70d3e78774a5

diff --git a/libopkg/opkg.h b/libopkg/opkg.h
index 970590c..9cb977e 100644
--- a/libopkg/opkg.h
+++ b/libopkg/opkg.h
@@ -18,12 +18,14 @@
 #ifndef OPKG_H
 #define OPKG_H
 
-typedef struct _opkg_t opkg_t;
-typedef struct _opkg_package_t opkg_package_t;
+#include "pkg.h"
+#include "opkg_message.h"
+
+//typedef struct _opkg_package_t opkg_package_t;
 typedef struct _opkg_progress_data_t opkg_progress_data_t;
 
-typedef void (*opkg_progress_callback_t) (opkg_t *opkg, const opkg_progress_data_t *progress, void *user_data);
-typedef void (*opkg_package_callback_t) (opkg_t *opkg, opkg_package_t *package, void *user_data);
+typedef void (*opkg_progress_callback_t) (const opkg_progress_data_t *progress, void *user_data);
+typedef void (*opkg_package_callback_t) (pkg_t *pkg, void *user_data);
 
 enum _opkg_action_t
 {
@@ -43,7 +45,8 @@ enum _opkg_error_code_t
   OPKG_PACKAGE_NOT_FOUND,
   OPKG_PACKAGE_NOT_INSTALLED,
   OPKG_GPG_ERROR,
-  OPKG_MD5_ERROR
+  OPKG_MD5_ERROR,
+  OPKG_SHA256_ERROR
 };
 
 struct _opkg_package_t
@@ -54,7 +57,6 @@ struct _opkg_package_t
   char *repository;
   char *description;
   char *tags;
-  char *url;
   int size;
   int installed;
 };
@@ -63,28 +65,25 @@ struct _opkg_progress_data_t
 {
   int percentage;
   int action;
-  opkg_package_t *package;
+  pkg_t *pkg;
 };
 
-opkg_package_t* opkg_package_new ();
-void opkg_package_free (opkg_package_t *package);
-
-opkg_t* opkg_new ();
-void opkg_free (opkg_t *opkg);
-void opkg_get_option (opkg_t *opkg, char *option, void **value);
-void opkg_set_option (opkg_t *opkg, char *option, void *value);
-int opkg_re_read_config_files (opkg_t *opkg);
+int opkg_new (void);
+void opkg_free (void);
+int opkg_re_read_config_files (void);
+void opkg_get_option (char *option, void **value);
+void opkg_set_option (char *option, void *value);
 
-int opkg_install_package (opkg_t *opkg, const char *package_name, opkg_progress_callback_t callback, void *user_data);
-int opkg_remove_package (opkg_t *opkg, const char *package_name, opkg_progress_callback_t callback, void *user_data);
-int opkg_upgrade_package (opkg_t *opkg, const char *package_name, opkg_progress_callback_t callback, void *user_data);
-int opkg_upgrade_all (opkg_t *opkg, opkg_progress_callback_t callback, void *user_data);
-int opkg_update_package_lists (opkg_t *opkg, opkg_progress_callback_t callback, void *user_data);
+int opkg_install_package (const char *package_name, opkg_progress_callback_t callback, void *user_data);
+int opkg_remove_package (const char *package_name, opkg_progress_callback_t callback, void *user_data);
+int opkg_upgrade_package (const char *package_name, opkg_progress_callback_t callback, void *user_data);
+int opkg_upgrade_all (opkg_progress_callback_t callback, void *user_data);
+int opkg_update_package_lists (opkg_progress_callback_t callback, void *user_data);
 
-int opkg_list_packages (opkg_t *opkg, opkg_package_callback_t callback, void *user_data);
-int opkg_list_upgradable_packages (opkg_t *opkg, opkg_package_callback_t callback, void *user_data);
-opkg_package_t* opkg_find_package (opkg_t *opkg, const char *name, const char *version, const char *architecture, const char *repository);
+int opkg_list_packages (opkg_package_callback_t callback, void *user_data);
+int opkg_list_upgradable_packages (opkg_package_callback_t callback, void *user_data);
+pkg_t* opkg_find_package (const char *name, const char *version, const char *architecture, const char *repository);
 
-int opkg_repository_accessibility_check(opkg_t *opkg);
+int opkg_repository_accessibility_check(void);
 
 #endif /* OPKG_H */