Просмотр исходного кода

libdpkg: Remove unused epochsdiffer()

Guillem Jover лет назад: 14
Родитель
Сommit
06ee559bfc
4 измененных файлов с 2 добавлено и 12 удалено
  1. 0 2
      lib/dpkg/dpkg-db.h
  2. 0 1
      lib/dpkg/libdpkg.map
  3. 2 2
      lib/dpkg/test/t-version.c
  4. 0 7
      lib/dpkg/vercmp.c

+ 0 - 2
lib/dpkg/dpkg-db.h

@@ -393,8 +393,6 @@ bool versionsatisfied3(const struct versionrevision *it,
                        enum depverrel verrel);
 int versioncompare(const struct versionrevision *version,
                    const struct versionrevision *refversion);
-bool epochsdiffer(const struct versionrevision *a,
-                  const struct versionrevision *b);
 
 /*** from depcon.c ***/
 

+ 0 - 1
lib/dpkg/libdpkg.map

@@ -184,7 +184,6 @@ LIBDPKG_PRIVATE {
 	# Version struct handling
 	dpkg_version_blank;
 	dpkg_version_is_informative;
-	epochsdiffer;
 	versioncompare;
 	versiondescribe;
 	versionsatisfied3;

+ 2 - 2
lib/dpkg/test/t-version.c

@@ -37,11 +37,11 @@ test_version_compare(void)
 
 	dpkg_version_blank(&a);
 	dpkg_version_blank(&b);
-	test_fail(epochsdiffer(&a, &b));
+	test_pass(versioncompare(&a, &b) == 0);
 
 	a.epoch = 1;
 	b.epoch = 2;
-	test_pass(epochsdiffer(&a, &b));
+	test_fail(versioncompare(&a, &b) == 0);
 
 	/* Test for version equality. */
 	a = b = version(0, "0", "0");

+ 0 - 7
lib/dpkg/vercmp.c

@@ -26,13 +26,6 @@
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 
-bool
-epochsdiffer(const struct versionrevision *a,
-             const struct versionrevision *b)
-{
-  return a->epoch != b->epoch;
-}
-
 /**
  * Give a weight to the character to order in the version comparison.
  *