From d2dc3df90d20419dfaee03f3096ed18d20fa391a Mon Sep 17 00:00:00 2001 From: Matus Fabian Date: Mon, 14 Dec 2015 10:31:33 -0500 Subject: replacing all vec_sort() invocations to vec_sort_with_function() Change-Id: I05895827ed52be292112484cee7d0a2591b67335 Signed-off-by: Matus Fabian --- vpp-japi/japi/vppjni.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'vpp-japi') diff --git a/vpp-japi/japi/vppjni.c b/vpp-japi/japi/vppjni.c index 740a3425d90..4274c31dd91 100644 --- a/vpp-japi/japi/vppjni.c +++ b/vpp-japi/japi/vppjni.c @@ -362,6 +362,15 @@ out: return (rv); } +static int +name_sort_cmp (void * a1, void * a2) +{ + name_sort_t * n1 = a1; + name_sort_t * n2 = a2; + + return strcmp ((char *)n1->name, (char *)n2->name); +} + JNIEXPORT jstring JNICALL Java_org_openvpp_vppjapi_vppConn_getInterfaceList (JNIEnv * env, jobject obj, jstring name_filter) { @@ -387,8 +396,7 @@ JNIEXPORT jstring JNICALL Java_org_openvpp_vppjapi_vppConn_getInterfaceList } })); - vec_sort (nses, n1, n2, - strcmp ((char *)n1->name, (char *)n2->name)); + vec_sort_with_function (nses, name_sort_cmp); vec_foreach (ns, nses) s = format (s, "%s: %d, ", ns->name, ns->value); -- cgit 1.2.3-korg