[FFmpeg-cvslog] checkasm: Fix the function name sorting algorithm

[Henrik Gramner]

ffmpeg | branch: master | Henrik Gramner <henrik at gramner.com> | Sat Sep 26 20:15:35 2015 +0200| [19b28d047daa2bc9eaac0cca391bb5932fcb7059] | committer: Henrik Gramner

checkasm: Fix the function name sorting algorithm

The previous implementation was behaving incorrectly in some corner cases.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=19b28d047daa2bc9eaac0cca391bb5932fcb7059
---

 tests/checkasm/checkasm.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c
index 2f967e3..d4680f0 100644
--- a/tests/checkasm/checkasm.c
+++ b/tests/checkasm/checkasm.c
@@ -289,12 +289,16 @@ static void print_benchs(CheckasmFunc *f)
 /* ASCIIbetical sort except preserving natural order for numbers */
 static int cmp_func_names(const char *a, const char *b)
 {
+    const char *start = a;
     int ascii_diff, digit_diff;
 
-    for (; !(ascii_diff = *a - *b) && *a; a++, b++);
+    for (; !(ascii_diff = *(const unsigned char*)a - *(const unsigned char*)b) && *a; a++, b++);
     for (; av_isdigit(*a) && av_isdigit(*b); a++, b++);
 
-    return (digit_diff = av_isdigit(*a) - av_isdigit(*b)) ? digit_diff : ascii_diff;
+    if (a > start && av_isdigit(a[-1]) && (digit_diff = av_isdigit(*a) - av_isdigit(*b)))
+        return digit_diff;
+
+    return ascii_diff;
 }
 
 /* Perform a tree rotation in the specified direction and return the new root */