The following commit has been merged in the master branch:
commit ec53fd98f3d10274e2da5722c63fd7f6588b3eaf
Author: Guillem Jover <[email protected]>
Date: Tue Nov 2 20:39:08 2010 +0100
libdpkg: Rename print_error_fatal() to print_fatal_error()
diff --git a/dselect/main.cc b/dselect/main.cc
index 0510823..38df1c5 100644
--- a/dselect/main.cc
+++ b/dselect/main.cc
@@ -509,7 +509,7 @@ int main(int, const char *const *argv) {
cursesoff();
catch_fatal_error();
}
- push_error_handler(&ejbuf,print_error_fatal,0);
+ push_error_handler(&ejbuf, print_fatal_error, 0);
loadcfgfile(DSELECT, cmdinfos);
myopt(&argv,cmdinfos);
diff --git a/lib/dpkg/dpkg.h b/lib/dpkg/dpkg.h
index 8a8bbff..0a66a13 100644
--- a/lib/dpkg/dpkg.h
+++ b/lib/dpkg/dpkg.h
@@ -110,7 +110,7 @@ DPKG_BEGIN_DECLS
if (setjmp(*ejbuf)) { /* expect warning about possible clobbering of argv */\
catch_fatal_error(); \
}\
- push_error_handler(ejbuf, print_error_fatal, NULL); \
+ push_error_handler(ejbuf, print_fatal_error, NULL); \
umask(022); /* Make sure all our status databases are readable. */\
} while (0)
diff --git a/lib/dpkg/ehandle.c b/lib/dpkg/ehandle.c
index 8d85f79..4543d33 100644
--- a/lib/dpkg/ehandle.c
+++ b/lib/dpkg/ehandle.c
@@ -272,7 +272,9 @@ catch_fatal_error(void)
exit(2);
}
-void print_error_fatal(const char *emsg, const char *contextstring) {
+void
+print_fatal_error(const char *emsg, const char *contextstring)
+{
fprintf(stderr, "%s: %s\n",thisname,emsg);
}
diff --git a/lib/dpkg/ehandle.h b/lib/dpkg/ehandle.h
index 96ad86d..d86ccaf 100644
--- a/lib/dpkg/ehandle.h
+++ b/lib/dpkg/ehandle.h
@@ -42,7 +42,7 @@ enum {
typedef void error_printer(const char *emsg, const char *contextstring);
-void print_error_fatal(const char *emsg, const char *contextstring);
+void print_fatal_error(const char *emsg, const char *contextstring);
void catch_fatal_error(void);
void push_error_handler(jmp_buf *jbufp, error_printer *printerror,
diff --git a/lib/dpkg/libdpkg.Versions b/lib/dpkg/libdpkg.Versions
index cf460c4..1e9a25d 100644
--- a/lib/dpkg/libdpkg.Versions
+++ b/lib/dpkg/libdpkg.Versions
@@ -10,7 +10,7 @@ local:
LIBDPKG_PRIVATE {
# Error handling
set_error_display;
- print_error_fatal;
+ print_fatal_error;
catch_fatal_error;
push_error_handler;
push_checkpoint;
diff --git a/lib/dpkg/test.h b/lib/dpkg/test.h
index 9a48332..98695e2 100644
--- a/lib/dpkg/test.h
+++ b/lib/dpkg/test.h
@@ -49,7 +49,7 @@ main(int argc, char **argv)
if (setjmp(ejbuf)) {
catch_fatal_error();
}
- push_error_handler(&ejbuf, print_error_fatal, NULL);
+ push_error_handler(&ejbuf, print_fatal_error, NULL);
test();
diff --git a/src/main.c b/src/main.c
index b04a636..704e1e8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -595,7 +595,7 @@ void commandfd(const char *const *argv) {
bool mode = false;
int argc= 1;
lno= 0;
- push_error_handler(&ejbuf, print_error_fatal, NULL);
+ push_error_handler(&ejbuf, print_fatal_error, NULL);
do { c= getc(in); if (c == '\n') lno++; } while (c != EOF && isspace(c));
if (c == EOF) break;
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
