Move and replace showcopyright prototype from showcright.c to dpkg.h

diff --git a/ChangeLog b/ChangeLog
index 21b307444050c022efd85185a84e4294008b5b07..77445b34607842fd79488bfa6e89bf56e0ddad11 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-11  Guillem Jover  <guillem@debian.org>
+
+       * lib/showcright.c (showcopyright): Move function prototype to ...
+       * lib/dpkg.h: ... here, and replace existing one.
+
 2008-03-11  Guillem Jover  <guillem@debian.org>
 
        * lib/Makefile.am (libdpkg_a_SOURCES): Add 'dpkg-def.h'.

diff --git a/lib/dpkg.h b/lib/dpkg.h
index 60c050052ae14d12c42411d2e1ab5113194c7291..ccc4bf916ff2e6d4366a2bff30555433a59f9718 100644 (file)
--- a/lib/dpkg.h
+++ b/lib/dpkg.h
@@ -354,7 +354,7 @@ extern volatile int onerr_abort;
 /*** from showcright.c ***/
 
 struct cmdinfo;
-void showcopyright(const struct cmdinfo*, const char*);
+void showcopyright(const struct cmdinfo *c, const char *v) NONRETURNING;
 
 /*** from utils.c ***/
 

diff --git a/lib/showcright.c b/lib/showcright.c
index 3f130c68e1f5cc97f5c2ee98da536b32f2cc05c6..da61547cc4213c87e12cb6e3cbefa7a4fbd3a356 100644 (file)
--- a/lib/showcright.c
+++ b/lib/showcright.c
@@ -26,7 +26,6 @@
 
 #include <dpkg.h>
 
-void showcopyright(const struct cmdinfo *c, const char *v) NONRETURNING;
 void showcopyright(const struct cmdinfo *c, const char *v) {
   int fd;
   fd= open(COPYINGFILE,O_RDONLY);