Remove deprecated APIs

libversion/CMakeLists.txt

@@ -4,10 +4,9 @@ include(GenerateExportHeader)
 configure_file(config.h.in config.h @ONLY)
 
 set(LIBVERSION_SOURCES
-	compare.c
 	private/compare.c
 	private/parse.c
-	signature.c
+	compare.c
 )
 
 set(LIBVERSION_HEADERS

libversion/compare.c

@@ -81,27 +81,3 @@ int version_compare4(const char* v1, const char* v2, int v1_flags, int v2_flags)
 int version_compare2(const char* v1, const char* v2) {
 	return version_compare4(v1, v2, 0, 0);
 }
-
-/* deprecated */
-int version_compare3(const char* v1, const char* v2, int flags) {
-	return version_compare4(v1, v2, flags, flags);
-}
-
-int version_compare_simple(const char* v1, const char* v2) {
-	return version_compare2(v1, v2);
-}
-
-int version_compare_flags(const char* v1, const char* v2, int flags) {
-	const int v1_flags =
-		((flags & VERSIONFLAG_P_IS_PATCH_LEFT) ? VERSIONFLAG_P_IS_PATCH : 0) |
-		((flags & VERSIONFLAG_ANY_IS_PATCH_LEFT) ? VERSIONFLAG_ANY_IS_PATCH : 0);
-	const int v2_flags =
-		((flags & VERSIONFLAG_P_IS_PATCH_RIGHT) ? VERSIONFLAG_P_IS_PATCH : 0) |
-		((flags & VERSIONFLAG_ANY_IS_PATCH_RIGHT) ? VERSIONFLAG_ANY_IS_PATCH : 0);
-
-	return version_compare4(v1, v2, v1_flags, v2_flags);
-}
-
-int version_compare_flags2(const char* v1, const char* v2, int v1_flags, int v2_flags) {
-	return version_compare4(v1, v2, v1_flags, v2_flags);
-}

libversion/version.h

@@ -38,49 +38,15 @@ extern "C" {
 	)
 
 enum {
-#ifndef LIBVERSION_NO_DEPRECATED
-	/* deprecated: use version_compare4() and VERSIONFLAG_P_IS_PATCH */
-	VERSIONFLAG_P_IS_PATCH_LEFT = 0x1,
-
-	/* deprecated: use version_compare4() and VERSIONFLAG_P_IS_PATCH */
-	VERSIONFLAG_P_IS_PATCH_RIGHT = 0x2,
-
-	/* deprecated: use version_compare4() and VERSIONFLAG_ANY_IS_PATCH */
-	VERSIONFLAG_ANY_IS_PATCH_LEFT = 0x4,
-
-	/* deprecated: use version_compare4() and VERSIONFLAG_ANY_IS_PATCH */
-	VERSIONFLAG_ANY_IS_PATCH_RIGHT = 0x8,
-#endif
-
-	VERSIONFLAG_P_IS_PATCH = 0x1 | 0x2,
-	VERSIONFLAG_ANY_IS_PATCH = 0x4 | 0x8,
-	VERSIONFLAG_LOWER_BOUND = 0x10,
-	VERSIONFLAG_UPPER_BOUND = 0x20,
+	VERSIONFLAG_P_IS_PATCH = 0x1,
+	VERSIONFLAG_ANY_IS_PATCH = 0x2,
+	VERSIONFLAG_LOWER_BOUND = 0x4,
+	VERSIONFLAG_UPPER_BOUND = 0x8,
 };
 
 extern LIBVERSION_EXPORT int version_compare2(const char* v1, const char* v2);
 extern LIBVERSION_EXPORT int version_compare4(const char* v1, const char* v2, int v1_flags, int v2_flags);
 
-#ifndef LIBVERSION_NO_DEPRECATED
-/* deprecated */
-typedef unsigned long version_signature_t;
-
-/* deprecated */
-extern LIBVERSION_DEPRECATED_EXPORT version_signature_t version_signature_simple(const char* v);
-
-/* deprecated, use version_compare2 */
-extern LIBVERSION_DEPRECATED_EXPORT int version_compare_simple(const char* v1, const char* v2);
-
-/* deprecated, use version_compare4 */
-extern LIBVERSION_DEPRECATED_EXPORT int version_compare_flags(const char* v1, const char* v2, int flags);
-
-/* deprecated, use version_compare4 */
-extern LIBVERSION_DEPRECATED_EXPORT int version_compare_flags2(const char* v1, const char* v2, int v1_flags, int v2_flags);
-
-/* deprecated, use version_compare4 */
-extern LIBVERSION_DEPRECATED_EXPORT int version_compare3(const char* v1, const char* v2, int flags);
-#endif
-
 #ifdef __cplusplus
 }
 #endif

tests/CMakeLists.txt

@@ -2,13 +2,5 @@ add_executable(compare_test compare_test.c)
 target_link_libraries(compare_test libversion)
 add_test(compare_test compare_test)
 
-add_executable(compare_deprecated_test compare_deprecated_test.c)
-target_link_libraries(compare_deprecated_test libversion)
-add_test(compare_deprecated_test compare_deprecated_test)
-
-add_executable(signature_test signature_test.c)
-target_link_libraries(signature_test libversion)
-add_test(signature_test signature_test)
-
 add_executable(compare_fuzzer compare_fuzzer.c)
 target_link_libraries(compare_fuzzer libversion)