The following commit has been merged in the master branch:
commit de42418d9c0a255cec4440b5f99e764654440159
Author: Guillem Jover <[email protected]>
Date: Sat Oct 16 20:59:07 2010 +0200
libdpkg: Remove set_error_display()
If the code needs to set a different error printer then it should push
a new error context instead.
diff --git a/lib/dpkg/ehandle.c b/lib/dpkg/ehandle.c
index 61bf5eb..81d61ac 100644
--- a/lib/dpkg/ehandle.c
+++ b/lib/dpkg/ehandle.c
@@ -84,16 +84,6 @@ static struct {
void *args[20];
} emergency;
-static void set_error_printer(struct error_context *ec,
- error_printer *printerror,
- const char *contextstring);
-
-void set_error_display(error_printer *printerror,
- const char *contextstring) {
- assert(econtext);
- set_error_printer(econtext, printerror, contextstring);
-}
-
static void DPKG_ATTR_NORET
run_error_handler(void)
{
diff --git a/lib/dpkg/ehandle.h b/lib/dpkg/ehandle.h
index 1b72700..4483e20 100644
--- a/lib/dpkg/ehandle.h
+++ b/lib/dpkg/ehandle.h
@@ -53,7 +53,6 @@ void push_error_context_jump(jmp_buf *jbufp, error_printer
*printerror,
void push_error_context_func(error_handler *func, error_printer *printerror,
const char *contextstring);
void error_unwind(int flagset);
-void set_error_display(error_printer *printerror, const char *contextstring);
void push_cleanup(void (*f1)(int argc, void **argv), int flagmask1,
void (*f2)(int argc, void **argv), int flagmask2,
diff --git a/lib/dpkg/libdpkg.Versions b/lib/dpkg/libdpkg.Versions
index 0850328..e70a0e5 100644
--- a/lib/dpkg/libdpkg.Versions
+++ b/lib/dpkg/libdpkg.Versions
@@ -11,7 +11,6 @@ LIBDPKG_PRIVATE {
# Error handling
push_error_context_jump;
push_error_context_func;
- set_error_display;
print_fatal_error;
catch_fatal_error;
push_checkpoint;
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
