From 765b94caaa93566a9792019ec5d2bf56fc8100a3 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Fri, 30 Nov 2007 11:43:47 +0000 Subject: [PATCH] Changed return value of function icu_sortkey8_from_utf16 to void. The return value is useless and error is signalled by status parameter. This breaks binary compatibility for that function but it is not in use anywhere. --- include/yaz/icu_I18N.h | 8 ++++---- src/icu_I18N.c | 12 +++++------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/include/yaz/icu_I18N.h b/include/yaz/icu_I18N.h index 8bf0de8..c0af4cf 100644 --- a/include/yaz/icu_I18N.h +++ b/include/yaz/icu_I18N.h @@ -120,10 +120,10 @@ int icu_utf16_casemap(struct icu_buf_utf16 * dest16, const char *locale, char action, UErrorCode *status); -UErrorCode icu_sortkey8_from_utf16(UCollator *coll, - struct icu_buf_utf8 * dest8, - struct icu_buf_utf16 * src16, - UErrorCode * status); +void icu_sortkey8_from_utf16(UCollator *coll, + struct icu_buf_utf8 * dest8, + struct icu_buf_utf16 * src16, + UErrorCode * status); struct icu_tokenizer { diff --git a/src/icu_I18N.c b/src/icu_I18N.c index 7809d2d..de84874 100644 --- a/src/icu_I18N.c +++ b/src/icu_I18N.c @@ -2,7 +2,7 @@ * Copyright (C) 1995-2007, Index Data ApS * See the file LICENSE for details. * - * $Id: icu_I18N.c,v 1.20 2007-11-12 11:11:16 adam Exp $ + * $Id: icu_I18N.c,v 1.21 2007-11-30 11:43:47 adam Exp $ */ #if HAVE_CONFIG_H @@ -465,10 +465,10 @@ int icu_utf16_casemap(struct icu_buf_utf16 * dest16, -UErrorCode icu_sortkey8_from_utf16(UCollator *coll, - struct icu_buf_utf8 * dest8, - struct icu_buf_utf16 * src16, - UErrorCode * status) +void icu_sortkey8_from_utf16(UCollator *coll, + struct icu_buf_utf8 * dest8, + struct icu_buf_utf16 * src16, + UErrorCode * status) { int32_t sortkey_len = 0; @@ -488,8 +488,6 @@ UErrorCode icu_sortkey8_from_utf16(UCollator *coll, dest8->utf8_len = sortkey_len; else icu_buf_utf8_clear(dest8); - - return sortkey_len; } -- 1.7.10.4