pkgtools

morpheus pkg tools
git clone git://git.2f30.org/pkgtools.git
Log | Files | Refs | README | LICENSE

commit e5492f5e26d6520f426ba3978410dc70cc3f88c9
parent 0337ea9979944afc906309072f437bb4efc72551
Author: sin <sin@2f30.org>
Date:   Tue Jun 17 13:10:20 +0100

Rename dbcollide() to dbfscollide()

Diffstat:
db.c | 2+-
db.h | 2+-
installpkg.c | 8++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/db.c b/db.c @@ -106,7 +106,7 @@ dbfind(struct db *db, const char *name) } int -dbcollide(struct db *db, const char *name) +dbfscollide(struct db *db, const char *name) { char pkgpath[PATH_MAX]; char path[PATH_MAX]; diff --git a/db.h b/db.h @@ -14,7 +14,7 @@ extern int vflag; struct db *dbinit(const char *); int dbload(struct db *); -int dbcollide(struct db *, const char *); +int dbfscollide(struct db *, const char *); int dbadd(struct db *, const char *); int dbwalk(struct db *, int (*)(struct db *, struct pkg *, void *), void *); int dblinks(struct db *, const char *); diff --git a/installpkg.c b/installpkg.c @@ -5,7 +5,7 @@ #include "db.h" #include "util.h" -static int collidepkg(struct db *, struct pkg *, void *); +static int fscollidepkg(struct db *, struct pkg *, void *); static void usage(void) @@ -55,7 +55,7 @@ main(int argc, char *argv[]) if (vflag == 1) printf("installing %s\n", path); if (fflag == 0) { - r = dbwalk(db, collidepkg, path); + r = dbwalk(db, fscollidepkg, path); if (r < 0) exit(EXIT_FAILURE); } @@ -70,10 +70,10 @@ main(int argc, char *argv[]) } static int -collidepkg(struct db *db, struct pkg *pkg, void *file) +fscollidepkg(struct db *db, struct pkg *pkg, void *file) { (void) pkg; - if (dbcollide(db, file) < 0) + if (dbfscollide(db, file) < 0) return -1; return 0; }