Преглед на файлове

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

Guillem Jover преди 18 години
родител
ревизия
518b1f979c
променени са 3 файла, в които са добавени 6 реда и са изтрити 2 реда
  1. 5 0
      ChangeLog
  2. 1 1
      lib/dpkg.h
  3. 0 1
      lib/showcright.c

+ 5 - 0
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>
 2008-03-11  Guillem Jover  <guillem@debian.org>
 
 
 	* lib/Makefile.am (libdpkg_a_SOURCES): Add 'dpkg-def.h'.
 	* lib/Makefile.am (libdpkg_a_SOURCES): Add 'dpkg-def.h'.

+ 1 - 1
lib/dpkg.h

@@ -354,7 +354,7 @@ extern volatile int onerr_abort;
 /*** from showcright.c ***/
 /*** from showcright.c ***/
 
 
 struct cmdinfo;
 struct cmdinfo;
-void showcopyright(const struct cmdinfo*, const char*);
+void showcopyright(const struct cmdinfo *c, const char *v) NONRETURNING;
 
 
 /*** from utils.c ***/
 /*** from utils.c ***/
 
 

+ 0 - 1
lib/showcright.c

@@ -26,7 +26,6 @@
 
 
 #include <dpkg.h>
 #include <dpkg.h>
 
 
-void showcopyright(const struct cmdinfo *c, const char *v) NONRETURNING;
 void showcopyright(const struct cmdinfo *c, const char *v) {
 void showcopyright(const struct cmdinfo *c, const char *v) {
   int fd;
   int fd;
   fd= open(COPYINGFILE,O_RDONLY);
   fd= open(COPYINGFILE,O_RDONLY);