libdpkg: Rename versionsatisfied3() to dpkg_version_relate()

At the same time reorder the arguments and place the relation operator
in the middle, which is a more natural way to express it.

lib/dpkg/depcon.c

@@ -29,8 +29,9 @@
 bool
 versionsatisfied(struct pkgbin *it, struct deppossi *against)
 {
-	return versionsatisfied3(&it->version, &against->version,
-	                         against->verrel);
+	return dpkg_version_relate(&it->version,
+	                           against->verrel,
+	                           &against->version);
 }
 
 /**

lib/dpkg/dpkg-db.h

@@ -374,9 +374,9 @@ void varbufdependency(struct varbuf *vb, struct dependency *dep);
 
 /*** from vercmp.c ***/
 
-bool versionsatisfied3(const struct dpkg_version *a,
-                       const struct dpkg_version *b,
-                       enum dpkg_relation rel);
+bool dpkg_version_relate(const struct dpkg_version *a,
+                         enum dpkg_relation rel,
+                         const struct dpkg_version *b);
 int dpkg_version_compare(const struct dpkg_version *a,
                          const struct dpkg_version *b);
 

lib/dpkg/libdpkg.map

@@ -185,8 +185,8 @@ LIBDPKG_PRIVATE {
 	dpkg_version_blank;
 	dpkg_version_is_informative;
 	dpkg_version_compare;
+	dpkg_version_relate;
 	versiondescribe;
-	versionsatisfied3;
 	parseversion;
 
 	# Architecture database

lib/dpkg/vercmp.c

@@ -106,9 +106,9 @@ dpkg_version_compare(const struct dpkg_version *a,
 }
 
 bool
-versionsatisfied3(const struct dpkg_version *a,
-                  const struct dpkg_version *b,
-                  enum dpkg_relation rel)
+dpkg_version_relate(const struct dpkg_version *a,
+                    enum dpkg_relation rel,
+                    const struct dpkg_version *b)
 {
   int r;
 

src/depcon.c

@@ -426,8 +426,9 @@ depisok(struct dependency *dep, struct varbuf *whynot,
                         versiondescribe(&pkg_pos->installed.version,
                                         vdew_nonambig));
                 break;
-              } else if (!versionsatisfied3(&pkg_pos->configversion,
-                                            &possi->version, possi->verrel)) {
+              } else if (!dpkg_version_relate(&pkg_pos->configversion,
+                                              possi->verrel,
+                                              &possi->version)) {
                 sprintf(linebuf, _("  %.250s latest configured version is "
                                    "%.250s.\n"),
                         pkg_name(pkg_pos, pnaw_nonambig),

src/enquiry.c

@@ -355,7 +355,7 @@ assert_version_support(const char *const *argv,
     return 0;
   case stat_unpacked: case stat_halfconfigured: case stat_halfinstalled:
   case stat_triggersawaited:
-    if (versionsatisfied3(&pkg->configversion, version, dpkg_relation_ge))
+    if (dpkg_version_relate(&pkg->configversion, dpkg_relation_ge, version))
       return 0;
     printf(_("Version of dpkg with working %s support not yet configured.\n"
              " Please use 'dpkg --configure dpkg', and then try again.\n"),