Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=f449a11c3e3f649018abe274854d7e716eba6373
commit f449a11c3e3f649018abe274854d7e716eba6373 Author: Michel Hermier <[email protected]> Date: Mon Oct 27 11:00:18 2014 +0100 libpacman: Simplify _pacman_localdb_write* internal API by using specialisation. diff --git a/lib/libpacman/db/localdb.cpp b/lib/libpacman/db/localdb.cpp index 83c762b..66157ee 100644 --- a/lib/libpacman/db/localdb.cpp +++ b/lib/libpacman/db/localdb.cpp @@ -369,7 +369,7 @@ package_ptr LocalDatabase::scan(const char *target, unsigned int inforeq) } static -void _pacman_localdb_write_string(const char *entry, const char *value, FILE *stream) +void _pacman_localdb_write(const char *entry, const char *value, FILE *stream) { if(!_pacman_strempty(value)) { fprintf(stream, "%%%s%%\n%s\n\n", entry, value); @@ -377,7 +377,7 @@ void _pacman_localdb_write_string(const char *entry, const char *value, FILE *st } static -void _pacman_localdb_write_stringlist(const char *entry, const FStringList &values, FILE *stream) +void _pacman_localdb_write(const char *entry, const FStringList &values, FILE *stream) { if(!values.empty()) { fprintf(stream, "%%%s%%\n", entry); @@ -411,19 +411,19 @@ int LocalDatabase::write(package_ptr info, unsigned int inforeq) retval = 1; goto cleanup; } - _pacman_localdb_write_string("NAME", info->name(), fp); - _pacman_localdb_write_string("VERSION", info->version(), fp); + _pacman_localdb_write("NAME", info->name(), fp); + _pacman_localdb_write("VERSION", info->version(), fp); if(info->description()[0]) { - _pacman_localdb_write_stringlist("DESC", info->desc_localized, fp); + _pacman_localdb_write("DESC", info->desc_localized, fp); } - _pacman_localdb_write_stringlist("GROUPS", info->groups(), fp); - _pacman_localdb_write_string("URL", info->url(), fp); - _pacman_localdb_write_stringlist("LICENSE", info->license, fp); - _pacman_localdb_write_string("ARCH", info->arch, fp); - _pacman_localdb_write_string("BUILDDATE", info->builddate, fp); - _pacman_localdb_write_string("BUILDTYPE", info->buildtype, fp); - _pacman_localdb_write_string("INSTALLDATE", info->installdate, fp); - _pacman_localdb_write_string("PACKAGER", info->packager, fp); + _pacman_localdb_write("GROUPS", info->groups(), fp); + _pacman_localdb_write("URL", info->url(), fp); + _pacman_localdb_write("LICENSE", info->license, fp); + _pacman_localdb_write("ARCH", info->arch, fp); + _pacman_localdb_write("BUILDDATE", info->builddate, fp); + _pacman_localdb_write("BUILDTYPE", info->buildtype, fp); + _pacman_localdb_write("INSTALLDATE", info->installdate, fp); + _pacman_localdb_write("PACKAGER", info->packager, fp); if(info->size) { fprintf(fp, "%%SIZE%%\n" "%ld\n\n", info->size); @@ -432,7 +432,7 @@ int LocalDatabase::write(package_ptr info, unsigned int inforeq) fprintf(fp, "%%REASON%%\n" "%d\n\n", info->reason()); } - _pacman_localdb_write_stringlist("TRIGGERS", info->triggers(), fp); + _pacman_localdb_write("TRIGGERS", info->triggers(), fp); fclose(fp); fp = NULL; } @@ -445,8 +445,8 @@ int LocalDatabase::write(package_ptr info, unsigned int inforeq) retval = -1; goto cleanup; } - _pacman_localdb_write_stringlist("FILES", info->files(), fp); - _pacman_localdb_write_stringlist("BACKUP", info->backup(), fp); + _pacman_localdb_write("FILES", info->files(), fp); + _pacman_localdb_write("BACKUP", info->backup(), fp); fclose(fp); fp = NULL; } @@ -459,10 +459,10 @@ int LocalDatabase::write(package_ptr info, unsigned int inforeq) retval = -1; goto cleanup; } - _pacman_localdb_write_stringlist("DEPENDS", info->depends(), fp); - _pacman_localdb_write_stringlist("REQUIREDBY", info->requiredby(), fp); - _pacman_localdb_write_stringlist("CONFLICTS", info->conflicts(), fp); - _pacman_localdb_write_stringlist("PROVIDES", info->provides(), fp); + _pacman_localdb_write("DEPENDS", info->depends(), fp); + _pacman_localdb_write("REQUIREDBY", info->requiredby(), fp); + _pacman_localdb_write("CONFLICTS", info->conflicts(), fp); + _pacman_localdb_write("PROVIDES", info->provides(), fp); fclose(fp); fp = NULL; } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
