From owner-svn-src-projects@freebsd.org Thu Oct 22 14:29:20 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B4E79A1C974 for ; Thu, 22 Oct 2015 14:29:20 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7124C1CC8; Thu, 22 Oct 2015 14:29:20 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9METJVb014953; Thu, 22 Oct 2015 14:29:19 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9METJLc014952; Thu, 22 Oct 2015 14:29:19 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201510221429.t9METJLc014952@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 22 Oct 2015 14:29:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r289754 - projects/collation/lib/libc/locale X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Oct 2015 14:29:20 -0000 Author: bapt Date: Thu Oct 22 14:29:19 2015 New Revision: 289754 URL: https://svnweb.freebsd.org/changeset/base/289754 Log: libc/collate: minor tweaks / fix The main "fix" here is properly setting a collate loading error for each early return. Tweaks include removing unnecessary null checks, adding assertions (from Illumos) and a couple of variables to reduces code differences and improve readability. For normal use, there are no functional changes here. Obtained from: DragonflyBSD, Illumos Modified: projects/collation/lib/libc/locale/collate.c Modified: projects/collation/lib/libc/locale/collate.c ============================================================================== --- projects/collation/lib/libc/locale/collate.c Thu Oct 22 12:15:40 2015 (r289753) +++ projects/collation/lib/libc/locale/collate.c Thu Oct 22 14:29:19 2015 (r289754) @@ -1,6 +1,6 @@ /*- * Copyright 2014 Garrett D'Amore - * Copright 2010 Nexenta Systems, Inc. All rights reserved. + * Copyright 2010 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 1995 Alex Tatmanjants * at Electronni Visti IA, Kiev, Ukraine. * All rights reserved. @@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -116,9 +117,10 @@ __collate_load_tables_l(const char *enco struct stat sbuf; int fd; + table->__collate_load_error = 1; + /* 'encoding' must be already checked. */ if (strcmp(encoding, "C") == 0 || strcmp(encoding, "POSIX") == 0) { - table->__collate_load_error = 1; return (_LDP_CACHE); } @@ -167,7 +169,7 @@ __collate_load_tables_l(const char *enco i = (sizeof (collate_char_t) * (UCHAR_MAX + 1)) + (sizeof (collate_chain_t) * chains) + (sizeof (collate_large_t) * info->large_count); - for (z = 0; z < (info->directive_count); z++) { + for (z = 0; z < info->directive_count; z++) { i += sizeof (collate_subst_t) * info->subst_count[z]; } if (i != (sbuf.st_size - (TMP - map))) { @@ -176,6 +178,7 @@ __collate_load_tables_l(const char *enco return (_LDP_ERROR); } + table->info = info; table->char_pri_table = (void *)TMP; TMP += sizeof (collate_char_t) * (UCHAR_MAX + 1); @@ -198,21 +201,15 @@ __collate_load_tables_l(const char *enco else table->large_pri_table = NULL; - table->info = info; table->__collate_load_error = 0; return (_LDP_LOADED); } -/* - * Note: for performance reasons, we have expanded bsearch here. This avoids - * function call overhead with each comparison. - */ - -static int32_t * +static const int32_t * substsearch(struct xlocale_collate *table, const wchar_t key, int pass) { - collate_subst_t *p; + const collate_subst_t *p; int n = table->info->subst_count[pass]; if (n == 0) @@ -225,9 +222,15 @@ substsearch(struct xlocale_collate *tabl return (NULL); p = table->subst_table[pass] + (key & ~COLLATE_SUBST_PRIORITY); + assert(p->key == key); return (p->pri); } +/* + * Note: for performance reasons, we have expanded bsearch here. This avoids + * function call overhead with each comparison. + */ + static collate_chain_t * chainsearch(struct xlocale_collate *table, const wchar_t *key, int *len) { @@ -403,8 +406,11 @@ _collate_wxfrm(struct xlocale_collate *t const int32_t *state; size_t want = 0; size_t need = 0; + int ndir = table->info->directive_count; - for (pass = 0; pass <= table->info->directive_count; pass++) { + assert(src); + + for (pass = 0; pass <= ndir; pass++) { state = NULL; @@ -418,7 +424,7 @@ _collate_wxfrm(struct xlocale_collate *t } /* special pass for undefined */ - if (pass == table->info->directive_count) { + if (pass == ndir) { direc = DIRECTIVE_FORWARD | DIRECTIVE_UNDEFINED; } else { direc = table->info->directive[pass]; @@ -428,8 +434,7 @@ _collate_wxfrm(struct xlocale_collate *t if (direc & DIRECTIVE_BACKWARD) { wchar_t *bp, *fp, c; - if (tr) - free(tr); + free(tr); if ((tr = wcsdup(t)) == NULL) { errno = ENOMEM; goto fail; @@ -482,13 +487,11 @@ _collate_wxfrm(struct xlocale_collate *t } } } - if (tr) - free(tr); + free(tr); return (need); fail: - if (tr) - free(tr); + free(tr); return ((size_t)(-1)); } @@ -548,8 +551,11 @@ _collate_sxfrm(struct xlocale_collate *t size_t need = 0; int b; uint8_t buf[XFRM_BYTES]; + int ndir = table->info->directive_count; + + assert(src); - for (pass = 0; pass <= table->info->directive_count; pass++) { + for (pass = 0; pass <= ndir; pass++) { state = NULL; @@ -563,7 +569,7 @@ _collate_sxfrm(struct xlocale_collate *t } /* special pass for undefined */ - if (pass == table->info->directive_count) { + if (pass == ndir) { direc = DIRECTIVE_FORWARD | DIRECTIVE_UNDEFINED; } else { direc = table->info->directive[pass]; @@ -573,8 +579,7 @@ _collate_sxfrm(struct xlocale_collate *t if (direc & DIRECTIVE_BACKWARD) { wchar_t *bp, *fp, c; - if (tr) - free(tr); + free(tr); if ((tr = wcsdup(t)) == NULL) { errno = ENOMEM; goto fail; @@ -643,13 +648,11 @@ _collate_sxfrm(struct xlocale_collate *t } } } - if (tr) - free(tr); + free(tr); return (need); fail: - if (tr) - free(tr); + free(tr); return ((size_t)(-1)); }