changed struct rpmdb to struct rpmdb_s for C++

CVS patchset: 1686
CVS date: 1997/06/16 17:30:59

diff --git a/CHANGES b/CHANGES
index 89853e4..2e820c1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@
          use for binary packages (note the rpmdir is prepended to it)
        - used pclose() instead of fclose() in -t code
        - updated man pages
+       - changed "struct rpmdb" to "struct rpmdb_s" for C++
 
 2.4 -> 2.4.1:
        - take advantage of lchown() if it's available

diff --git a/lib/rpmdb.c b/lib/rpmdb.c
index 8a4dbea..7b36e0f 100644 (file)
--- a/lib/rpmdb.c
+++ b/lib/rpmdb.c
@@ -32,7 +32,7 @@
    one. Version numbers still need verification, but it gets us in the
    right area w/o a linear search through the database. */
 
-struct rpmdb {
+struct rpmdb_s {
     faFile pkgs;
     dbiIndex * nameIndex, * fileIndex, * groupIndex, * providesIndex;
     dbiIndex * requiredbyIndex, * conflictsIndex;
@@ -75,7 +75,7 @@ int rpmdbInit (char * prefix, int perms) {
 int openDatabase(char * prefix, char * dbpath, rpmdb *rpmdbp, int mode, 
                 int perms, int justcheck) {
     char * filename;
-    struct rpmdb db;
+    struct rpmdb_s db;
     int i;
     struct flock lockinfo;
 
@@ -219,7 +219,7 @@ int openDatabase(char * prefix, char * dbpath, rpmdb *rpmdbp, int mode,
        }
     }
 
-    *rpmdbp = malloc(sizeof(struct rpmdb));
+    *rpmdbp = malloc(sizeof(struct rpmdb_s));
     **rpmdbp = db;
 
     if (justcheck) {

diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index ccb952a..5ed6c99 100644 (file)
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -210,7 +210,7 @@ int rpmOsScore(char * os);
 
 /** **/
 
-typedef struct rpmdb * rpmdb;
+typedef struct rpmdb_s * rpmdb;
 
 typedef void (*rpmNotifyFunction)(const unsigned long amount,
                               const unsigned long total);