The following commit has been merged in the master branch:
commit 538f2581689bf17193e23242cfc7bcd151d0993a
Author: Guillem Jover <guil...@debian.org>
Date: Fri Mar 30 22:42:00 2012 +0200
Rename blankversion() to dpkg_version_blank()
diff --git a/lib/dpkg/fields.c b/lib/dpkg/fields.c
index 13ea19f..0f2297c 100644
--- a/lib/dpkg/fields.c
+++ b/lib/dpkg/fields.c
@@ -544,7 +544,7 @@ f_dependency(struct pkginfo *pigp, struct pkgbin *pifp,
p++; while (isspace(*p)) p++;
} else {
dop->verrel= dvr_none;
- blankversion(&dop->version);
+ dpkg_version_blank(&dop->version);
}
if (!*p || *p == ',') break;
if (*p != '|')
diff --git a/lib/dpkg/libdpkg.map b/lib/dpkg/libdpkg.map
index 4e77640..e11fdf5 100644
--- a/lib/dpkg/libdpkg.map
+++ b/lib/dpkg/libdpkg.map
@@ -177,7 +177,7 @@ LIBDPKG_PRIVATE {
nffreeall;
# Version struct handling
- blankversion;
+ dpkg_version_blank;
informativeversion;
epochsdiffer;
versioncompare;
diff --git a/lib/dpkg/pkg.c b/lib/dpkg/pkg.c
index efe0169..fe258dc 100644
--- a/lib/dpkg/pkg.c
+++ b/lib/dpkg/pkg.c
@@ -104,7 +104,7 @@ pkgbin_blank(struct pkgbin *pkgbin)
pkgbin->installedsize = NULL;
pkgbin->bugs = NULL;
pkgbin->origin = NULL;
- blankversion(&pkgbin->version);
+ dpkg_version_blank(&pkgbin->version);
pkgbin->conffiles = NULL;
pkgbin->arbs = NULL;
}
@@ -118,7 +118,7 @@ pkg_blank(struct pkginfo *pkg)
pkg->priority = pri_unknown;
pkg->otherpriority = NULL;
pkg->section = NULL;
- blankversion(&pkg->configversion);
+ dpkg_version_blank(&pkg->configversion);
pkg->files = NULL;
pkg->clientdata = NULL;
pkg->trigaw.head = NULL;
diff --git a/lib/dpkg/test/t-version.c b/lib/dpkg/test/t-version.c
index cf99375..452e1c7 100644
--- a/lib/dpkg/test/t-version.c
+++ b/lib/dpkg/test/t-version.c
@@ -35,8 +35,8 @@ test_version_compare(void)
{
struct versionrevision a, b;
- blankversion(&a);
- blankversion(&b);
+ dpkg_version_blank(&a);
+ dpkg_version_blank(&b);
test_fail(epochsdiffer(&a, &b));
a.epoch = 1;
@@ -83,7 +83,7 @@ test_version_parse(void)
char *verstr;
/* Test 0 versions. */
- blankversion(&a);
+ dpkg_version_blank(&a);
b = version(0, "0", "");
test_pass(parseversion(&a, "0", NULL) == 0);
diff --git a/lib/dpkg/version.c b/lib/dpkg/version.c
index 4bdf782..f5d2d18 100644
--- a/lib/dpkg/version.c
+++ b/lib/dpkg/version.c
@@ -24,7 +24,7 @@
#include <dpkg/version.h>
void
-blankversion(struct versionrevision *version)
+dpkg_version_blank(struct versionrevision *version)
{
version->epoch = 0;
version->version = NULL;
diff --git a/lib/dpkg/version.h b/lib/dpkg/version.h
index c03ceb5..b865737 100644
--- a/lib/dpkg/version.h
+++ b/lib/dpkg/version.h
@@ -33,7 +33,7 @@ struct versionrevision {
const char *revision;
};
-void blankversion(struct versionrevision *version);
+void dpkg_version_blank(struct versionrevision *version);
bool informativeversion(const struct versionrevision *version);
DPKG_END_DECLS
diff --git a/src/enquiry.c b/src/enquiry.c
index be84f20..ffeb4ab 100644
--- a/src/enquiry.c
+++ b/src/enquiry.c
@@ -606,7 +606,7 @@ cmpversions(const char *const *argv)
dpkg_error_destroy(&err);
}
} else {
- blankversion(&a);
+ dpkg_version_blank(&a);
}
if (*argv[2] && strcmp(argv[2],"<unknown>")) {
if (parseversion(&b, argv[2], &err) < 0) {
@@ -617,7 +617,7 @@ cmpversions(const char *const *argv)
dpkg_error_destroy(&err);
}
} else {
- blankversion(&b);
+ dpkg_version_blank(&b);
}
if (!informativeversion(&a)) {
return informativeversion(&b) ? rip->if_none_a : rip->if_none_both;
diff --git a/src/processarc.c b/src/processarc.c
index 317846f..f0bccc6 100644
--- a/src/processarc.c
+++ b/src/processarc.c
@@ -368,7 +368,7 @@ pkg_disappear(struct pkginfo *pkg, struct pkginfo *infavour)
pkg_set_want(pkg, want_unknown);
pkg_reset_eflags(pkg);
- blankversion(&pkg->configversion);
+ dpkg_version_blank(&pkg->configversion);
pkgbin_blank(&pkg->installed);
pkg->clientdata->fileslistvalid = false;
@@ -1155,7 +1155,7 @@ void process_archive(const char *filename) {
if (possi->verrel != dvr_none)
newpossi->version= possi->version;
else
- blankversion(&newpossi->version);
+ dpkg_version_blank(&newpossi->version);
newpossi->cyclebreak = false;
*newpossilastp= newpossi;
newpossilastp= &newpossi->next;
diff --git a/src/remove.c b/src/remove.c
index 14e2ddd..58f34a5 100644
--- a/src/remove.c
+++ b/src/remove.c
@@ -468,7 +468,7 @@ static void removal_bulk_remove_configfiles(struct pkginfo
*pkg) {
/* We're about to remove the configuration, so remove the note
* about which version it was ... */
- blankversion(&pkg->configversion);
+ dpkg_version_blank(&pkg->configversion);
modstatdb_note(pkg);
/* Remove from our list any conffiles that aren't ours any more or
@@ -603,7 +603,7 @@ void removal_bulk(struct pkginfo *pkg) {
debug(dbg_general, "removal_bulk no postrm, no conffiles, purging");
pkg_set_want(pkg, want_purge);
- blankversion(&pkg->configversion);
+ dpkg_version_blank(&pkg->configversion);
} else if (pkg->want == want_purge) {
removal_bulk_remove_configfiles(pkg);
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
