diff options
| author | Dan McGee <dan@archlinux.org> | 2010-12-14 03:16:36 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2010-12-14 04:14:03 +0100 |
| commit | 94d3d665f0b0b4c934de73580afcb137fea9baa6 (patch) | |
| tree | 23d2861627d7568767dfcd7f067f0b8f2f971a9e | |
| parent | 5f36523af9de20a8c74714da4125bb553b0fae2c (diff) | |
| download | pacman-94d3d665f0b0b4c934de73580afcb137fea9baa6.tar.gz pacman-94d3d665f0b0b4c934de73580afcb137fea9baa6.tar.xz | |
Mark sync_db_read() as static
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | lib/libalpm/be_sync.c | 8 | ||||
| -rw-r--r-- | lib/libalpm/db.h | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 8d770005..6059277b 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -141,6 +141,9 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db) return(0); } +/* Forward decl so I don't reorganize the whole file right now */ +static int sync_db_read(pmdb_t *db, struct archive *archive, struct archive_entry *entry); + int _alpm_sync_db_populate(pmdb_t *db) { int count = 0; @@ -205,7 +208,7 @@ int _alpm_sync_db_populate(pmdb_t *db) count++; } else { /* we have desc, depends or deltas - parse it */ - _alpm_sync_db_read(db, archive, entry); + sync_db_read(db, archive, entry); } } @@ -215,7 +218,7 @@ int _alpm_sync_db_populate(pmdb_t *db) return(count); } -int _alpm_sync_db_read(pmdb_t *db, struct archive *archive, struct archive_entry *entry) +static int sync_db_read(pmdb_t *db, struct archive *archive, struct archive_entry *entry) { char line[1024]; const char *entryname = NULL; @@ -416,6 +419,7 @@ int _alpm_sync_db_read(pmdb_t *db, struct archive *archive, struct archive_entry error: FREE(pkgname); FREE(filename); + /* TODO: return 0 always? */ return(0); } diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index 133b0959..d3b99f43 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -81,7 +81,6 @@ int _alpm_local_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq); int _alpm_local_db_remove(pmdb_t *db, pmpkg_t *info); int _alpm_sync_db_populate(pmdb_t *db); -int _alpm_sync_db_read(pmdb_t *db, struct archive *archive, struct archive_entry *entry); /* cache bullshit */ /* packages */ |