[PATCH] Don't use comparison_fn_t

Ulf Hermann ulf.hermann@qt.io
Thu Apr 20 13:40:00 GMT 2017


Not all search.h declare it, and it is not very helpful anyway.

Signed-off-by: Ulf Hermann <ulf.hermann@qt.io>
---
 libcpu/ChangeLog    | 4 ++++
 libcpu/i386_parse.y | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/libcpu/ChangeLog b/libcpu/ChangeLog
index 79110c2..ec22dd2 100644
--- a/libcpu/ChangeLog
+++ b/libcpu/ChangeLog
@@ -1,3 +1,7 @@
+2017-04-20  Ulf Hermann <ulf.hermann@qt.io>
+
+	* i386_parse.y: Eliminate comparison_fn_t.
+
 2016-11-02  Mark Wielaard  <mjw@redhat.com>
 
 	* i386_disasm.c (i386_disasm): Add fallthrough comment.
diff --git a/libcpu/i386_parse.y b/libcpu/i386_parse.y
index 15a72b1..5fc0682 100644
--- a/libcpu/i386_parse.y
+++ b/libcpu/i386_parse.y
@@ -309,10 +309,10 @@ instr:		  bytes ':' bitfieldopt kID bitfieldopt optargs
 			  newp->mnemonic = $4;
 			  if (newp->mnemonic != (void *) -1l
 			      && tfind ($4, &mnemonics,
-					(comparison_fn_t) strcmp) == NULL)
+					(int (*)(const void *, const void *)) strcmp) == NULL)
 			    {
 			      if (tsearch ($4, &mnemonics,
-					   (comparison_fn_t) strcmp) == NULL)
+					   (int (*)(const void *, const void *)) strcmp) == NULL)
 				error (EXIT_FAILURE, errno, "tsearch");
 			      ++nmnemonics;
 			    }
-- 
2.1.4



More information about the Elfutils-devel mailing list