Move extern declarations to header files and stop defining them as extern

diff --git a/ChangeLog b/ChangeLog
index e0f3c53dcbb034b30ac91ce059423bab08f63531..74142581f99ed6f3607ca54f273a2b850a426631 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-29  Guillem Jover  <guillem@debian.org>
+
+       * src/main.c (log_file): Move definition to ...
+       * lib/dpkg-db.h: ... here.
+       * src/configure.c (status_pipes): Remove extern definition.
+       * src/errors.c (status_pipes): Likewise.
+       * lib/tarfn.c (TarExtractor): Do not declare as extern.
+
 2007-11-29  Guillem Jover  <guillem@debian.org>
 
        * dpkg-deb/build.c (arbitrary_fields): Define as static.

diff --git a/debian/changelog b/debian/changelog
index 89e97d1536920520367ef15fccac464081a97349..4a96d02173c985913422b5539b75909dd50b20d5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ dpkg (1.14.12) UNRELEASED; urgency=low
 
   [ Guillem Jover ]
   * Define several private functions and variables as static.
+  * Move extern declarations to header files and stop defining them as extern.
 
  -- Guillem Jover <guillem@debian.org>  Sat, 24 Nov 2007 07:38:13 +0200
 

diff --git a/lib/dpkg-db.h b/lib/dpkg-db.h
index 3c0e5ffe9aa8c6fe20afb67e9b77f6bb94cb3506..b6f43afba8f9b8aac47f9a408435f942eecfdf84 100644 (file)
--- a/lib/dpkg-db.h
+++ b/lib/dpkg-db.h
@@ -174,6 +174,7 @@ void modstatdb_shutdown(void);
 
 extern char *statusfile, *availablefile; /* initialised by modstatdb_init */
 
+extern const char *log_file;
 void log_message(const char *fmt, ...);
 
 /*** from database.c ***/

diff --git a/lib/tarfn.c b/lib/tarfn.c
index 68901d88cc8f968397e5cb5e4fd82e4f109643fc..e498da7d15f4504cb1878e454918b5cf604e5497 100644 (file)
--- a/lib/tarfn.c
+++ b/lib/tarfn.c
@@ -119,7 +119,7 @@ typedef struct symlinkList {
        struct symlinkList *next;
 } symlinkList;
 
-extern int
+int
 TarExtractor(
  void *                        userData
 ,const TarFunctions *  functions)

diff --git a/src/configure.c b/src/configure.c
index 23f928037f5a6c52a5469f8c3bffd16cf18c15a1..2b21dafb9d73e38aa532601f242e11442805ace8 100644 (file)
--- a/src/configure.c
+++ b/src/configure.c
@@ -55,8 +55,6 @@ static enum conffopt promptconfaction(const char* cfgfile, const char* realold,
                const char* realnew, int useredited, int distedited,
                enum conffopt what);
 
-extern struct pipef *status_pipes;
-
 
 void deferred_configure(struct pkginfo *pkg) {
        /* The algorithm for deciding what to configure first is as follows:

diff --git a/src/errors.c b/src/errors.c
index a830c2d1f15e575f334352e0690e00ee655c0644..b87d850d93f8b187142ab3bc276e5d4a9b04f647 100644 (file)
--- a/src/errors.c
+++ b/src/errors.c
@@ -50,8 +50,6 @@ static struct error_report *reports=0;
 static struct error_report **lastreport= &reports;
 static struct error_report emergency;
 
-extern struct pipef *status_pipes;
-
 void print_error_perpackage(const char *emsg, const char *arg) {
   struct error_report *nr;
   

diff --git a/src/main.c b/src/main.c
index 28c4d5ae29183dce02b23f980ba1576b10dec8de..7fadab9fc90e8ac92358e50e055ba20b487937c4 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -374,8 +374,6 @@ static void setforce(const struct cmdinfo *cip, const char *value) {
   }
 }
 
-extern const char *log_file;
-
 static const char okpassshortopts[]= "D";
 
 void execbackend(const char *const *argv) NONRETURNING;