merged rpmlib.h and package.h

CVS patchset: 641
CVS date: 1996/06/17 19:43:55

diff --git a/install.c b/install.c
index 213b68f..ff0e777 100644 (file)
--- a/install.c
+++ b/install.c
@@ -8,7 +8,6 @@
 #include "ftp.h"
 #include "install.h"
 #include "lib/rpmlib.h"
-#include "lib/package.h"
 #include "messages.h"
 #include "query.h"
 

diff --git a/lib/install.c b/lib/install.c
index f567415..aff34da 100644 (file)
--- a/lib/install.c
+++ b/lib/install.c
@@ -17,7 +17,6 @@
 #include "install.h"
 #include "md5.h"
 #include "misc.h"
-#include "package.h"
 #include "rpmerr.h"
 #include "rpmlib.h"
 

diff --git a/lib/package.c b/lib/package.c
index 53a657f..f2264c0 100644 (file)
--- a/lib/package.c
+++ b/lib/package.c
@@ -7,7 +7,6 @@
 #include "header.h"
 #include "misc.h"
 #include "oldheader.h"
-#include "package.h"
 #include "rpmerr.h"
 #include "rpmlead.h"
 #include "rpmlib.h"

diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 217dbad..48bf631 100644 (file)
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -15,6 +15,11 @@ struct rpmTagTableEntry {
     int val;
 };
 
+int pkgReadHeader(int fd, Header * hdr, int * isSource);
+   /* 0 = success */
+   /* 1 = bad magic */
+   /* 2 = error */
+
 extern const struct rpmTagTableEntry rpmTagTable[];
 extern const int rpmTagTableSize;
 

diff --git a/query.c b/query.c
index f5e43a8..92b6c35 100644 (file)
--- a/query.c
+++ b/query.c
@@ -11,7 +11,6 @@
 #include <unistd.h>
 
 #include "lib/messages.h"
-#include "lib/package.h"
 #include "rpmlib.h"
 #include "query.h"
 

diff --git a/rpm2cpio.c b/rpm2cpio.c
index cf1640b..37f8f7e 100644 (file)
--- a/rpm2cpio.c
+++ b/rpm2cpio.c
@@ -5,7 +5,6 @@
 #include <fcntl.h>
 #include <zlib.h>
 
-#include "lib/package.h"
 #include "rpmlib.h"
 
 char *zlib_err [] = {

diff --git a/verify.c b/verify.c
index dbc4b5b..def923e 100644 (file)
--- a/verify.c
+++ b/verify.c
@@ -5,7 +5,6 @@
 #include <unistd.h>
 
 #include "lib/messages.h"
-#include "lib/package.h"
 #include "query.h"
 #include "rpmlib.h"
 #include "verify.h"