From: graham.gower <graham.gower@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358>
Date: Tue, 3 Nov 2009 01:38:51 +0000 (+0000)
Subject: Remove unused callbacks, a legacy of the now removed ipkg API.
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=609411c43f5da9bc507aa04f47f9b3ba12a7f510;p=oweals%2Fopkg-lede.git

Remove unused callbacks, a legacy of the now removed ipkg API.

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

diff --git a/libopkg/libopkg.c b/libopkg/libopkg.c
index 787a510..07de2c6 100644
--- a/libopkg/libopkg.c
+++ b/libopkg/libopkg.c
@@ -26,59 +26,6 @@
 #include "opkg_message.h"
 #include "opkg_error.h"
 
-opkg_status_callback opkg_cb_status = NULL;
-opkg_list_callback opkg_cb_list = NULL;
-
-int default_opkg_message_callback(opkg_conf_t *conf, message_level_t level, 
-				  char *msg)
-{
-     if (conf && (conf->verbosity < level)) {
-	  return 0;
-     } else {
-          if ( level == OPKG_ERROR ){
-             push_error_list(msg); 
-          } else
-	    printf("%s",msg);
-     }
-     return 0;
-}
-
-int default_opkg_list_callback(char *name, char *desc, char *version, 
-			       pkg_state_status_t status, void *userdata)
-{
-     if (desc)
-	  printf("%s - %s - %s\n", name, version, desc);
-     else
-	  printf("%s - %s\n", name, version);
-     return 0;
-}
-
-int default_opkg_files_callback(char *name, char *desc, char *version,
-                   pkg_state_status_t status, void *userdata)
-{
-     if (desc)
-	  printf("%s\n", desc);
-     return 0;
-}
-
-int default_opkg_status_callback(char *name, int istatus, char *desc,
-				 void *userdata)
-{
-     printf("%s\n", desc);
-     return 0;
-}
-
-char* default_opkg_response_callback(char *question)
-{
-     char *response = NULL;
-     printf("%s",question);
-     fflush(stdout);
-     do {
-	  response = (char *)file_read_line_alloc(stdin);
-     } while (response == NULL);
-     return response;
-}
-
 /* This is used for backward compatibility */
 int
 opkg_op (int argc, char *argv[])
@@ -122,10 +69,6 @@ opkg_op (int argc, char *argv[])
              !strcmp(cmd_name,"status") )
            args.noreadfeedsfile = 1;
 
-	opkg_cb_message = default_opkg_message_callback;
-	opkg_cb_response = default_opkg_response_callback;
-	opkg_cb_status = default_opkg_status_callback;
-
 
 	err = opkg_conf_init (&opkg_conf, &args);
 	args_deinit (&args);
@@ -136,11 +79,6 @@ opkg_op (int argc, char *argv[])
 		return err;
 	}
 
- 	if ( strcmp(cmd_name, "files")==0)
-	     opkg_cb_list = default_opkg_files_callback;
- 	else
-	     opkg_cb_list = default_opkg_list_callback;
-
 	cmd = opkg_cmd_find (cmd_name);
 	if (cmd == NULL)
 	{
diff --git a/libopkg/libopkg.h b/libopkg/libopkg.h
index c4f741d..5e9564a 100644
--- a/libopkg/libopkg.h
+++ b/libopkg/libopkg.h
@@ -31,17 +31,6 @@
 #include "pkg.h"
 #include "user.h"
 
-typedef int (*opkg_status_callback)(char *name, int istatus, char *desc,
-	void *userdata);
-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 */
 
-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 */
 #endif
diff --git a/libopkg/opkg_message.c b/libopkg/opkg_message.c
index fc4a196..33a9c90 100644
--- a/libopkg/opkg_message.c
+++ b/libopkg/opkg_message.c
@@ -33,7 +33,7 @@ opkg_message (opkg_conf_t * conf, message_level_t level, char *fmt, ...)
 	if (level == OPKG_ERROR) {
 		char msg[256];
 		vsnprintf(msg, 256, fmt, ap);
-		push_error_list(&error_list, msg);
+		push_error_list(msg);
 	} else
 		vprintf(fmt, ap);