Mercurial > hg > octave-kai > gnulib-hg
changeset 11510:192bb1b6ecf2
Trivial simplification of last commit.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sun, 26 Apr 2009 15:48:57 +0200 |
parents | ef4e896a3b4f |
children | d604b921ed8d |
files | lib/uniconv/u-conv-to-enc.h lib/uniconv/u8-conv-to-enc.c |
diffstat | 2 files changed, 8 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/uniconv/u-conv-to-enc.h +++ b/lib/uniconv/u-conv-to-enc.h @@ -25,7 +25,6 @@ size_t *scaled_offsets; char *result; size_t length; - int retval; if (offsets != NULL && srclen > 0) { @@ -42,11 +41,10 @@ result = resultbuf; length = *lengthp; - retval = mem_iconveha ((const char *) src, srclen * sizeof (UNIT), - UTF_NAME, tocode, - handler == iconveh_question_mark, handler, - scaled_offsets, &result, &length); - if (retval < 0) + if (mem_iconveha ((const char *) src, srclen * sizeof (UNIT), + UTF_NAME, tocode, + handler == iconveh_question_mark, handler, + scaled_offsets, &result, &length) < 0) { int saved_errno = errno; free (scaled_offsets);
--- a/lib/uniconv/u8-conv-to-enc.c +++ b/lib/uniconv/u8-conv-to-enc.c @@ -70,13 +70,11 @@ { char *result = resultbuf; size_t length = *lengthp; - int retval = - mem_iconveha ((const char *) src, srclen, - "UTF-8", tocode, - handler == iconveh_question_mark, handler, - offsets, &result, &length); - if (retval < 0) + if (mem_iconveha ((const char *) src, srclen, + "UTF-8", tocode, + handler == iconveh_question_mark, handler, + offsets, &result, &length) < 0) return NULL; if (result == NULL) /* when (resultbuf == NULL && length == 0) */