From f996e527764fa6b4517ee8cfc80be65c9b598bdd Mon Sep 17 00:00:00 2001 From: "7u83@mail.ru" <7u83@mail.ru@noemail.net> Date: Fri, 13 Apr 2018 16:04:30 +0000 Subject: [PATCH] For .num key there can be data after num FossilOrigin-Name: 142bc2f1d430ef12ac8347ff7a7e77b1b957c6be11e970f4aa5ad709bf7e5eab --- src/cw/cw_ktv_mavlcmp.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/cw/cw_ktv_mavlcmp.c b/src/cw/cw_ktv_mavlcmp.c index c0a56d6b..9f56c3c3 100644 --- a/src/cw/cw_ktv_mavlcmp.c +++ b/src/cw/cw_ktv_mavlcmp.c @@ -1,3 +1,6 @@ + +#include + #include "ktv.h" /** * @brief Default function to compare two values of type #cw_KTV_t. @@ -34,8 +37,21 @@ int cw_ktv_mavlcmp(const void *v1, const void *v2) return rc; } - i1 = atoi(d1+1); - i2 = atoi(d2+1); + d1++; + d2++; + i1 = atoi(d1); + i2 = atoi(d2); + + rc = i1-i2; + if (rc != 0) + return rc; + + while (isdigit(*d1)) + d1++; + while (isdigit(*d2)) + d2++; + + return strcmp(d1,d2); + - return i1-i2; }