The following commit has been merged in the master branch:
commit c0a65e5f663e6f80bb36aa9c7e2949347bbc6e36
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Sat Jun 28 08:33:13 2008 +0300
libdpkg: Move onerr_abort definition from mlib.c to ehandle.c
diff --git a/ChangeLog b/ChangeLog
index 8226ee0..18d13f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-06-28 Guillem Jover <[EMAIL PROTECTED]>
+ * lib/dpkg.h (onerr_abort): Move declaration to the ehandle.c section.
+ * lib/mlib.c (onerr_abort): Move definition ...
+ * lib/ehandle.c: ... here.
+
+2008-06-28 Guillem Jover <[EMAIL PROTECTED]>
+
* lib/mlib.c (checksubprocerr): Move the PROCNOERR check before
the reporting, and exit directly instead in case of error.
diff --git a/lib/dpkg.h b/lib/dpkg.h
index ba6066c..13dc9e0 100644
--- a/lib/dpkg.h
+++ b/lib/dpkg.h
@@ -190,6 +190,8 @@ extern const char printforhelp[];
/*** from ehandle.c ***/
+extern volatile int onerr_abort;
+
typedef void error_printer(const char *emsg, const char *contextstring);
void push_error_handler(jmp_buf *jbufp, error_printer *printerror,
@@ -385,8 +387,6 @@ off_t buffer_write(buffer_data_t data, void *buf, off_t
length, const char *desc
off_t buffer_read(buffer_data_t data, void *buf, off_t length, const char
*desc);
off_t buffer_copy(buffer_data_t read_data, buffer_data_t write_data, off_t
limit, const char *desc);
-extern volatile int onerr_abort;
-
/*** from utils.c ***/
int cisdigit(int c);
diff --git a/lib/ehandle.c b/lib/ehandle.c
index 46a28bf..8f05d1d 100644
--- a/lib/ehandle.c
+++ b/lib/ehandle.c
@@ -39,6 +39,12 @@ static char errmsgbuf[4096];
* same again just in case.
*/
+/* Incremented when we do some kind of generally necessary operation,
+ * so that loops &c know to quit if we take an error exit. Decremented
+ * again afterwards.
+ */
+volatile int onerr_abort = 0;
+
#define NCALLS 2
struct cleanupentry {
diff --git a/lib/mlib.c b/lib/mlib.c
index 5f9cee4..ec9fe1f 100644
--- a/lib/mlib.c
+++ b/lib/mlib.c
@@ -35,11 +35,6 @@
#include <dpkg-db.h>
#include <md5.h>
-/* Incremented when we do some kind of generally necessary operation, so that
- * loops &c know to quit if we take an error exit. Decremented again
afterwards.
- */
-volatile int onerr_abort= 0;
-
void *m_malloc(size_t amount) {
#ifdef MDEBUG
unsigned short *r2, x;
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
