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

commit fb05e43a5a47d4a052c8504e5f548ffc5c1572dd
Author: Michel Hermier <[email protected]>
Date:   Sat Nov 9 10:07:53 2013 +0100

libpacman: Make _pacman_db_close and _pacman_db_rewind return an error status.

diff --git a/lib/libpacman/be_files.c b/lib/libpacman/be_files.c
index 1c81f64..251f1e5 100644
--- a/lib/libpacman/be_files.c
+++ b/lib/libpacman/be_files.c
@@ -91,28 +91,24 @@ int _pacman_db_open(pmdb_t *db)
return ret;
}

-void _pacman_db_close(pmdb_t *db)
+int _pacman_db_close(pmdb_t *db)
{
-       if(db == NULL) {
-               return;
-       }
+       ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));

if (islocal(db))
-               _pacman_localdb_close(db);
+               return _pacman_localdb_close(db);
else
-               _pacman_syncdb_close(db);
+               return _pacman_syncdb_close(db);
}

-void _pacman_db_rewind(pmdb_t *db)
+int _pacman_db_rewind(pmdb_t *db)
{
-       if(db == NULL) {
-               return;
-       }
+       ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));

if (islocal(db))
-               _pacman_localdb_rewind(db);
+               return _pacman_localdb_rewind(db);
else
-               _pacman_syncdb_rewind(db);
+               return _pacman_syncdb_rewind(db);
}

pmpkg_t *_pacman_db_scan(pmdb_t *db, const char *target, unsigned int inforeq)
diff --git a/lib/libpacman/db.h b/lib/libpacman/db.h
index 32a4cff..6114059 100644
--- a/lib/libpacman/db.h
+++ b/lib/libpacman/db.h
@@ -56,8 +56,8 @@ pmlist_t *_pacman_db_search(pmdb_t *db, pmlist_t *needles);
/* Prototypes for backends functions */
pmlist_t *_pacman_db_test(pmdb_t *db);
int _pacman_db_open(pmdb_t *db);
-void _pacman_db_close(pmdb_t *db);
-void _pacman_db_rewind(pmdb_t *db);
+int _pacman_db_close(pmdb_t *db);
+int _pacman_db_rewind(pmdb_t *db);
pmpkg_t *_pacman_db_scan(pmdb_t *db, const char *target, unsigned int inforeq);
int _pacman_db_read(pmdb_t *db, unsigned int inforeq, pmpkg_t *info);
int _pacman_db_write(pmdb_t *db, pmpkg_t *info, unsigned int inforeq);
diff --git a/lib/libpacman/db/localdb.c b/lib/libpacman/db/localdb.c
index f9aafb4..8552308 100644
--- a/lib/libpacman/db/localdb.c
+++ b/lib/libpacman/db/localdb.c
@@ -93,21 +93,23 @@ int _pacman_localdb_open(pmdb_t *db)
return 0;
}

-void _pacman_localdb_close(pmdb_t *db)
+int _pacman_localdb_close(pmdb_t *db)
{
if(db->handle) {
closedir(db->handle);
db->handle = NULL;
}
+       return 0;
}

-void _pacman_localdb_rewind(pmdb_t *db)
+int _pacman_localdb_rewind(pmdb_t *db)
{
if(db->handle == NULL) {
return;
}

rewinddir(db->handle);
+       return 0;
}

/* vim: set ts=2 sw=2 noet: */
diff --git a/lib/libpacman/db/localdb.h b/lib/libpacman/db/localdb.h
index 8fcee51..e8f9d6b 100644
--- a/lib/libpacman/db/localdb.h
+++ b/lib/libpacman/db/localdb.h
@@ -25,8 +25,8 @@

pmlist_t *_pacman_localdb_test(pmdb_t *db);
int _pacman_localdb_open(pmdb_t *db);
-void _pacman_localdb_close(pmdb_t *db);
-void _pacman_localdb_rewind(pmdb_t *db);
+int _pacman_localdb_close(pmdb_t *db);
+int _pacman_localdb_rewind(pmdb_t *db);

#endif /* _PACMAN_LOCALDB_H */

diff --git a/lib/libpacman/db/syncdb.c b/lib/libpacman/db/syncdb.c
index d2b9a79..7e90047 100644
--- a/lib/libpacman/db/syncdb.c
+++ b/lib/libpacman/db/syncdb.c
@@ -77,15 +77,16 @@ int _pacman_syncdb_open(pmdb_t *db)
return 0;
}

-void _pacman_syncdb_close(pmdb_t *db)
+int _pacman_syncdb_close(pmdb_t *db)
{
if(db->handle) {
archive_read_finish(db->handle);
db->handle = NULL;
}
+       return 0;
}

-void _pacman_syncdb_rewind(pmdb_t *db)
+int _pacman_syncdb_rewind(pmdb_t *db)
{
char dbpath[PATH_MAX];

@@ -99,6 +100,7 @@ void _pacman_syncdb_rewind(pmdb_t *db)
archive_read_finish(db->handle);
db->handle = NULL;
}
+       return 0;
}

/* vim: set ts=2 sw=2 noet: */
diff --git a/lib/libpacman/db/syncdb.h b/lib/libpacman/db/syncdb.h
index edfcdbb..bc64282 100644
--- a/lib/libpacman/db/syncdb.h
+++ b/lib/libpacman/db/syncdb.h
@@ -25,8 +25,8 @@

pmlist_t *_pacman_syncdb_test(pmdb_t *db);
int _pacman_syncdb_open(pmdb_t *db);
-void _pacman_syncdb_close(pmdb_t *db);
-void _pacman_syncdb_rewind(pmdb_t *db);
+int _pacman_syncdb_close(pmdb_t *db);
+int _pacman_syncdb_rewind(pmdb_t *db);

#endif /* _PACMAN_SYNCDB_H */
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to