[Frugalware-git] pacman-g2: libpacman: Make some Database methods non pure virtual anymore.

[Michel Hermier]

Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=79119eeaa82d0d3dd2ddf0487e346e30f8f6e985

commit 79119eeaa82d0d3dd2ddf0487e346e30f8f6e985
Author: Michel Hermier <herm...@frugalware.org>
Date:   Wed May 14 23:20:52 2014 +0200

libpacman: Make some Database methods non pure virtual anymore.

diff --git a/lib/libpacman/db.cpp b/lib/libpacman/db.cpp
index 40744c1..7140a64 100644
--- a/lib/libpacman/db.cpp
+++ b/lib/libpacman/db.cpp
@@ -132,6 +132,16 @@ int Database::open(int flags)
return open(flags, &cache_timestamp);
}

+int Database::open(int flags, time_t *timestamp)
+{
+       return -1;
+}
+
+int Database::close()
+{
+       return -1;
+}
+
int Database::gettimestamp(time_t *timestamp)
{
ASSERT(timestamp != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1));
@@ -155,6 +165,16 @@ int Database::settimestamp(const time_t *timestamp)
return _pacman_db_setlastupdate(this, buffer);
}

+int Database::rewind()
+{
+       return -1;
+}
+
+Package *Database::readpkg(unsigned int inforeq)
+{
+       return NULL;
+}
+
int Database::write(Package *info, unsigned int inforeq)
{
ASSERT(info != NULL, RET_ERR(PM_ERR_PKG_INVALID, -1));
diff --git a/lib/libpacman/db.h b/lib/libpacman/db.h
index d732159..915de45 100644
--- a/lib/libpacman/db.h
+++ b/lib/libpacman/db.h
@@ -49,14 +49,14 @@ public:
virtual pmlist_t *test() const;

virtual int open(int flags = 0);
-       virtual int close() = 0;
+       virtual int close();

virtual int gettimestamp(time_t *timestamp);
virtual int settimestamp(const time_t *timestamp);

/* Package iterator */
-       virtual int rewind() = 0;
-       virtual libpacman::Package *readpkg(unsigned int inforeq) = 0;
+       virtual int rewind();
+       virtual libpacman::Package *readpkg(unsigned int inforeq);
virtual libpacman::Package *scan(const char *target, unsigned int inforeq) = 0;

virtual int write(libpacman::Package *info, unsigned int inforeq);
@@ -76,7 +76,7 @@ public:
protected:
Database(libpacman::Handle *handle, const char *treename);

-       virtual int open(int flags, time_t *timestamp) = 0;
+       virtual int open(int flags, time_t *timestamp);

private:
};
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git