Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=0d4eda1df145e721e0240a4735fc1cfa517985cf
commit 0d4eda1df145e721e0240a4735fc1cfa517985cf Author: James Buren <[email protected]> Date: Sun Feb 19 15:18:03 2012 -0600 add an internal config macro to replace the one that disappears in new libarchive diff --git a/configure.ac b/configure.ac index d9383b3..5d656bf 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,9 @@ AC_SUBST(PM_MICRO_VERSION) AC_SUBST(PM_VERSION) AC_SUBST(PM_VERSION_INFO) +dnl Define the default bytes per block. +AC_DEFINE_UNQUOTED([PM_DEFAULT_BYTES_PER_BLOCK], [10240], [default bytes per block]) + dnl Define the default config file path for pacman-g2.conf PACCONF=/etc/pacman-g2.conf AC_DEFINE_UNQUOTED([PACCONF], ["$PACCONF"], [pacman-g2.conf location]) diff --git a/lib/libpacman/add.c b/lib/libpacman/add.c index 6c50dd8..d73fdcc 100644 --- a/lib/libpacman/add.c +++ b/lib/libpacman/add.c @@ -422,7 +422,7 @@ int _pacman_add_commit(pmtrans_t *trans, pmlist_t **data) archive_read_support_compression_all (archive); archive_read_support_format_all (archive); - if (archive_read_open_file (archive, info->data, ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) { + if (archive_read_open_file (archive, info->data, PM_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) { RET_ERR(PM_ERR_PKG_OPEN, -1); } diff --git a/lib/libpacman/be_files.c b/lib/libpacman/be_files.c index 41abaa7..6f2d18d 100644 --- a/lib/libpacman/be_files.c +++ b/lib/libpacman/be_files.c @@ -116,7 +116,7 @@ int _pacman_db_open(pmdb_t *db) } archive_read_support_compression_all(db->handle); archive_read_support_format_all(db->handle); - if(archive_read_open_filename(db->handle, dbpath, ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) { + if(archive_read_open_filename(db->handle, dbpath, PM_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) { archive_read_finish(db->handle); RET_ERR(PM_ERR_DB_OPEN, -1); } @@ -159,7 +159,7 @@ void _pacman_db_rewind(pmdb_t *db) db->handle = archive_read_new(); archive_read_support_compression_all(db->handle); archive_read_support_format_all(db->handle); - if (archive_read_open_filename(db->handle, dbpath, ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) { + if (archive_read_open_filename(db->handle, dbpath, PM_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) { archive_read_finish(db->handle); db->handle = NULL; } diff --git a/lib/libpacman/package.c b/lib/libpacman/package.c index e20af88..d7a1c9c 100644 --- a/lib/libpacman/package.c +++ b/lib/libpacman/package.c @@ -291,7 +291,7 @@ pmpkg_t *_pacman_pkg_load(const char *pkgfile) archive_read_support_compression_all (archive); archive_read_support_format_all (archive); - if ((ret = archive_read_open_file (archive, pkgfile, ARCHIVE_DEFAULT_BYTES_PER_BLOCK)) != ARCHIVE_OK) + if ((ret = archive_read_open_file (archive, pkgfile, PM_DEFAULT_BYTES_PER_BLOCK)) != ARCHIVE_OK) RET_ERR(PM_ERR_PKG_OPEN, NULL); info = _pacman_pkg_new(NULL, NULL); diff --git a/lib/libpacman/util.c b/lib/libpacman/util.c index 845271f..26bb891 100644 --- a/lib/libpacman/util.c +++ b/lib/libpacman/util.c @@ -327,7 +327,7 @@ int _pacman_unpack(const char *archive, const char *prefix, const char *fn) archive_read_support_compression_all(_archive); archive_read_support_format_all (_archive); - if (archive_read_open_file (_archive, archive, ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) + if (archive_read_open_file (_archive, archive, PM_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) RET_ERR(PM_ERR_PKG_OPEN, -1); while (archive_read_next_header (_archive, &entry) == ARCHIVE_OK) { _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
