You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ar...@apache.org on 2006/02/12 23:23:21 UTC
svn commit: r377254 - /incubator/harmony/enhanced/jchevm/libjc/resolve2.c
Author: archie
Date: Sun Feb 12 14:23:19 2006
New Revision: 377254
URL: http://svn.apache.org/viewcvs?rev=377254&view=rev
Log:
Remove redundant method.
Modified:
incubator/harmony/enhanced/jchevm/libjc/resolve2.c
Modified: incubator/harmony/enhanced/jchevm/libjc/resolve2.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/jchevm/libjc/resolve2.c?rev=377254&r1=377253&r2=377254&view=diff
==============================================================================
--- incubator/harmony/enhanced/jchevm/libjc/resolve2.c (original)
+++ incubator/harmony/enhanced/jchevm/libjc/resolve2.c Sun Feb 12 14:23:19 2006
@@ -36,7 +36,6 @@
_jc_resolve_info *info);
static int _jc_add_iface_methods(_jc_type *type,
_jc_method **methods);
-static int _jc_method_sorter(const void *item1, const void *item2);
static int _jc_type_sorter(const void *item1, const void *item2);
/*
@@ -1145,7 +1144,7 @@
}
/* Sort methods by name & signature */
- qsort(methods, max_methods, sizeof(*methods), _jc_method_sorter);
+ qsort(methods, max_methods, sizeof(*methods), _jc_method_compare);
/* Eliminate redundancies (methods declared in multiple interfaces) */
num_methods = max_methods;
@@ -1514,29 +1513,12 @@
/* Search */
methodp = bsearch(&key, ntype->methods, ntype->num_methods,
- sizeof(*ntype->methods), _jc_method_sorter);
+ sizeof(*ntype->methods), _jc_method_compare);
if (methodp != NULL && !_JC_ACC_TEST(*methodp, STATIC))
return *methodp;
/* Not found */
return NULL;
-}
-
-/*
- * Sorts method pointers by name, then signature.
- *
- * This must sort the same as org.dellroad.jc.cgen.Util.methodComparator.
- */
-static int
-_jc_method_sorter(const void *item1, const void *item2)
-{
- const _jc_method *const method1 = *((_jc_method **)item1);
- const _jc_method *const method2 = *((_jc_method **)item2);
- int diff;
-
- if ((diff = strcmp(method1->name, method2->name)) != 0)
- return diff;
- return strcmp(method1->signature, method2->signature);
}
/*