libopkg: remove internal dependency on libopkg.h and opkg_cmd.h

git-svn-id: http://opkg.googlecode.com/svn/trunk@64 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358

12 files changed, 27 insertions, 26 deletions

diff --git a/libopkg/libopkg.c b/libopkg/libopkg.c
index afc42da..3f5adc3 100644
--- a/libopkg/libopkg.c
+++ b/libopkg/libopkg.c
@@ -26,8 +26,6 @@
 
 
 
-opkg_message_callback opkg_cb_message = NULL;
-opkg_response_callback opkg_cb_response = NULL;
 opkg_status_callback opkg_cb_status = NULL;
 opkg_list_callback opkg_cb_list = NULL;
 
diff --git a/libopkg/libopkg.h b/libopkg/libopkg.h
index c2e6bf0..5a963bb 100644
--- a/libopkg/libopkg.h
+++ b/libopkg/libopkg.h
@@ -24,19 +24,17 @@
 #include "opkg_conf.h"
 #include "opkg_message.h"
 #include "opkg_state.h"
+#include "opkg_download.h"
+#include "opkg_utils.h"
 
 #include "args.h"
 #include "pkg.h"
+#include "user.h"
 
-typedef int (*opkg_message_callback)(opkg_conf_t *conf, message_level_t level, 
-	char *msg);
-typedef int (*opkg_list_callback)(char *name, char *desc, char *version, 
-	pkg_state_status_t status, void *userdata);
 typedef int (*opkg_status_callback)(char *name, int istatus, char *desc,
 	void *userdata);
-typedef char* (*opkg_response_callback)(char *question);
-typedef void (*opkg_download_progress_callback)(int percent, char *url);
-typedef void (*opkg_state_changed_callback)(opkg_state_t state, const char *data);
+typedef int (*opkg_list_callback)(char *name, char *desc, char *version, 
+	pkg_state_status_t status, void *userdata);
 typedef void (*opkg_progress_callback)(int complete, int total, void *userdata);
 
 extern int opkg_op(int argc, char *argv[]); /* opkglib.c */
@@ -76,15 +74,11 @@ extern int opkg_package_whatprovides(args_t *args, const char *file);
 extern int opkg_package_whatconflicts(args_t *args, const char *file);
 extern int opkg_package_whatreplaces(args_t *args, const char *file);
 
-extern opkg_message_callback opkg_cb_message; /* opkglib.c */
-extern opkg_response_callback opkg_cb_response;
+extern opkg_message_callback opkg_cb_message; /* opkg_message.c */
+extern opkg_response_callback opkg_cb_response; /* user.c */
 extern opkg_status_callback opkg_cb_status;
 extern opkg_list_callback opkg_cb_list;
 extern opkg_download_progress_callback opkg_cb_download_progress; /* opkg_download.c */
 extern opkg_state_changed_callback opkg_cb_state_changed; /* opkg_state.c */
 
-extern void push_error_list(struct errlist **errors,char * msg);
-extern void reverse_error_list(struct errlist **errors);
-extern void free_error_list();
-
 #endif
diff --git a/libopkg/opkg_download.c b/libopkg/opkg_download.c
index 4dab809..cbf8264 100644
--- a/libopkg/opkg_download.c
+++ b/libopkg/opkg_download.c
@@ -32,7 +32,6 @@
 #include "file_util.h"
 #include "str_util.h"
 
-#include "libopkg.h"
 opkg_download_progress_callback opkg_cb_download_progress = NULL;
 
 int
diff --git a/libopkg/opkg_download.h b/libopkg/opkg_download.h
index da65b00..b878380 100644
--- a/libopkg/opkg_download.h
+++ b/libopkg/opkg_download.h
@@ -20,6 +20,8 @@
 
 #include "opkg_conf.h"
 
+typedef void (*opkg_download_progress_callback)(int percent, char *url);
+
 int opkg_download(opkg_conf_t *conf, const char *src, const char *dest_file_name);
 int opkg_download_pkg(opkg_conf_t *conf, pkg_t *pkg, const char *dir);
 /*
diff --git a/libopkg/opkg_message.c b/libopkg/opkg_message.c
index b96e7d6..c00dd97 100644
--- a/libopkg/opkg_message.c
+++ b/libopkg/opkg_message.c
@@ -18,9 +18,7 @@
 #include "opkg_conf.h"
 #include "opkg_message.h"
 
-#include "libopkg.h"
-
-//#define opkg_message(conf, level, fmt, arg...) opkg_cb_message(conf, level, fmt, ## arg)
+opkg_message_callback opkg_cb_message = NULL;
 
 void
 opkg_message (opkg_conf_t * conf, message_level_t level, char *fmt, ...)
diff --git a/libopkg/opkg_message.h b/libopkg/opkg_message.h
index 86f895b..e0182dd 100644
--- a/libopkg/opkg_message.h
+++ b/libopkg/opkg_message.h
@@ -27,6 +27,9 @@ typedef enum {
      OPKG_DEBUG2,	/* more debug level message */
 } message_level_t;
 
+typedef int (*opkg_message_callback)(opkg_conf_t *conf, message_level_t level, 
+	char *msg);
+
 extern void opkg_message(opkg_conf_t *conf, message_level_t level, char *fmt, ...);
 
 #endif /* _OPKG_MESSAGE_H_ */
diff --git a/libopkg/opkg_remove.c b/libopkg/opkg_remove.c
index 6f80c4d..afb8aa7 100644
--- a/libopkg/opkg_remove.c
+++ b/libopkg/opkg_remove.c
@@ -26,8 +26,6 @@
 #include "sprintf_alloc.h"
 #include "str_util.h"
 
-#include "opkg_cmd.h"
-
 /*
  * Returns number of the number of packages depending on the packages provided by this package.
  * Every package implicitly provides itself.
diff --git a/libopkg/opkg_state.c b/libopkg/opkg_state.c
index f094de7..36018c7 100644
--- a/libopkg/opkg_state.c
+++ b/libopkg/opkg_state.c
@@ -15,7 +15,6 @@
    General Public License for more details.
 */
 
-#include "libopkg.h"
 #include "opkg_state.h"
 
 
diff --git a/libopkg/opkg_state.h b/libopkg/opkg_state.h
index 9442d93..44b8d0d 100644
--- a/libopkg/opkg_state.h
+++ b/libopkg/opkg_state.h
@@ -18,7 +18,7 @@
 #ifndef OPKG_STATE_H
 #define OPKG_STATE_H
 
-#include <opkg_message.h>
+#include "opkg_message.h"
 
 extern int opkg_state_changed;
 
@@ -36,5 +36,8 @@ typedef enum _opkg_state {
 
 void opkg_set_current_state (opkg_conf_t *conf, opkg_state_t state, const char *data);
 
+typedef void (*opkg_state_changed_callback)(opkg_state_t state, const char *data);
+
+
 
 #endif /* OPKG_STATE_H */
diff --git a/libopkg/opkg_utils.h b/libopkg/opkg_utils.h
index f47e35f..782d7d6 100644
--- a/libopkg/opkg_utils.h
+++ b/libopkg/opkg_utils.h
@@ -20,6 +20,10 @@
 
 #include "pkg.h"
 
+void push_error_list(struct errlist **errors,char * msg);
+void reverse_error_list(struct errlist **errors);
+void free_error_list();
+
 int get_available_blocks(char * filesystem);
 char **read_raw_pkgs_from_file(const char *file_name);
 char **read_raw_pkgs_from_stream(FILE *fp);
diff --git a/libopkg/user.c b/libopkg/user.c
index 557f7ce..2467de9 100644
--- a/libopkg/user.c
+++ b/libopkg/user.c
@@ -15,17 +15,19 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    General Public License for more details.
 */
-
+#include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
+#include <string.h>
 #include "file_util.h"
 #include "str_util.h"
-#include "libopkg.h"
-
+#include "user.h"
 
 static char *question = NULL;
 static int question_len = 255;
 
+opkg_response_callback opkg_cb_response = NULL;
+
 char *get_user_response(const char *format, ...)
 {
      int len = question_len;
diff --git a/libopkg/user.h b/libopkg/user.h
index fa0f818..a14575b 100644
--- a/libopkg/user.h
+++ b/libopkg/user.h
@@ -19,5 +19,6 @@
 #include <stdio.h>
 #include <stdarg.h>
 
+typedef char* (*opkg_response_callback)(char *question);
 char *get_user_response(const char *format, ...);