summaryrefslogtreecommitdiff
path: root/iconv/gconv_db.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-05-08 12:32:47 +0000
committerUlrich Drepper <drepper@redhat.com>1998-05-08 12:32:47 +0000
commitfab6d621377dcd0ace90066684cff09cb26ba725 (patch)
treeebb9ddc285c78bdfdccfa5ba33eba7a2e57d6cae /iconv/gconv_db.c
parentebcd12d4f11fac725e30b49a8dd1635ec0573eb5 (diff)
downloadglibc-fab6d621377dcd0ace90066684cff09cb26ba725.tar.gz
Update.
1998-05-08 12:26 Ulrich Drepper <drepper@cygnus.com> * iconv/gconv_int.h (struct gconv_module): Remove cost field and add cost_hi and cost_lo. * iconv/gconv_conf.c (builtin_modules): Initialize cost_hi from Cost parameter and set cost_lo to INT_MAX. (add_module): Take new parameter and use it to initialize cost_lo. (read_conf_file): Count modules being loaded and use counter for new parameter to add_module. * iconv/gconv_db.c (find_derivation): When look for cost examine cost_hi and cost_lo. 1998-05-08 10:52 Ulrich Drepper <drepper@cygnus.com> * string/bits/string2.h: Don't use unsigned char * unless really necessary since this disturbs C++. * sysdeps/i386/i486/bits/string.h: Likewise. Patch by Bernd Schmidt <crux@Pool.Informatik.RWTH-Aachen.DE>. 1998-05-08 13:53 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * malloc/malloc.c (top_check): Fix last change.
Diffstat (limited to 'iconv/gconv_db.c')
-rw-r--r--iconv/gconv_db.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/iconv/gconv_db.c b/iconv/gconv_db.c
index 62d8f0540c..503c5d0c86 100644
--- a/iconv/gconv_db.c
+++ b/iconv/gconv_db.c
@@ -261,7 +261,8 @@ find_derivation (const char *toset, const char *toset_expand,
{
__libc_lock_define_initialized (static, lock)
struct derivation_step *first, *current, **lastp, *best = NULL;
- int best_cost = 0;
+ int best_cost_hi = 0;
+ int best_cost_lo = 0;
int result;
result = derivation_lookup (fromset_expand ?: fromset, toset_expand ?: toset,
@@ -429,18 +430,22 @@ find_derivation (const char *toset, const char *toset_expand,
/* Determine the costs. If they are lower than the
previous solution (or this is the first solution)
remember this solution. */
- int cost = __gconv_modules_db[cnt]->cost;
+ int cost_hi = __gconv_modules_db[cnt]->cost_hi;
+ int cost_lo = __gconv_modules_db[cnt]->cost_lo;
struct derivation_step *runp = current;
while (runp->code != NULL)
{
- cost += runp->code->cost;
+ cost_hi += runp->code->cost_hi;
+ cost_lo += runp->code->cost_lo;
runp = runp->last;
}
- if (best == NULL || cost < best_cost)
+ if (best == NULL || cost_hi < best_cost_hi
+ || (cost_hi == best_cost_hi && cost_lo < best_cost_lo))
{
best = NEW_STEP (result_set, __gconv_modules_db[cnt],
current);
- best_cost = cost;
+ best_cost_hi = cost_hi;
+ best_cost_lo = cost_lo;
}
}
else