libdpkg: Move onerr_abort definition from mlib.c to ehandle.c

diff --git a/ChangeLog b/ChangeLog
index 8226ee065fdc8c675ea88e719549eba4c5e5296d..18d13f33ea8d15b15978787385cdd7a5bd431cfd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-28  Guillem Jover  <guillem@debian.org>
+
+       * 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  <guillem@debian.org>
 
        * lib/mlib.c (checksubprocerr): Move the PROCNOERR check before

diff --git a/lib/dpkg.h b/lib/dpkg.h
index ba6066c0aa9531f2bc6d7f19cb0935c9a3aa6102..13dc9e0b0a5f82b90a9aca66948fadb47ca43ae5 100644 (file)
--- 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 46a28bff7c25c53ceab747e1fb3fa846a6fb61f6..8f05d1dd8f1f5af5853e559125cba007359ea1a1 100644 (file)
--- 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 5f9cee41fc274d7e399be7b232d9a976e2a4e968..ec9fe1fb22487020a2bec2e6e4da7ac10d16ae05 100644 (file)
--- 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;