libopkg: do not clobber package flags during parsing

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

diff --git a/libopkg/opkg.h b/libopkg/opkg.h
index 7444faf917bd533a80e4b4acce7e7ddb69c6f35c..9a145e7b94a365ed76c21c58c5025f9f6b7c9b41 100644 (file)
--- a/libopkg/opkg.h
+++ b/libopkg/opkg.h
@@ -18,71 +18,48 @@
 #ifndef OPKG_H
 #define OPKG_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) (const opkg_progress_data_t *progress, void *user_data);
-typedef void (*opkg_package_callback_t) (opkg_package_t *package, void *user_data);
+#include "pkg.h"
+#include "opkg_message.h"
 
-enum _opkg_action_t
-{
-  OPKG_INSTALL,
-  OPKG_REMOVE,
-  OPKG_DOWNLOAD
-};
+typedef struct _opkg_progress_data_t opkg_progress_data_t;
 
-enum _opkg_error_code_t
-{
-  OPKG_NO_ERROR,
-  OPKG_UNKNOWN_ERROR,
-  OPKG_DOWNLOAD_FAILED,
-  OPKG_DEPENDENCIES_FAILED,
-  OPKG_PACKAGE_ALREADY_INSTALLED,
-  OPKG_PACKAGE_NOT_AVAILABLE,
-  OPKG_PACKAGE_NOT_FOUND,
-  OPKG_PACKAGE_NOT_INSTALLED,
-  OPKG_GPG_ERROR,
-  OPKG_MD5_ERROR,
-  OPKG_SHA256_ERROR
-};
+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);
 
-struct _opkg_package_t
-{
-  char *name;
-  char *version;
-  char *architecture;
-  char *repository;
-  char *description;
-  char *tags;
-  int size;
-  int installed;
+enum _opkg_action_t {
+       OPKG_INSTALL,
+       OPKG_REMOVE,
+       OPKG_DOWNLOAD
 };
 
-struct _opkg_progress_data_t
-{
-  int percentage;
-  int action;
-  opkg_package_t *package;
+struct _opkg_progress_data_t {
+       int percentage;
+       int action;
+       pkg_t *pkg;
 };
 
-opkg_package_t* opkg_package_new ();
-void opkg_package_free (opkg_package_t *package);
-
-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 (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_package_callback_t callback, void *user_data);
-int opkg_list_upgradable_packages (opkg_package_callback_t callback, void *user_data);
-opkg_package_t* opkg_find_package (const char *name, const char *version, const char *architecture, const char *repository);
+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(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_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(void);