summaryrefslogtreecommitdiff
path: root/lib/uniconv/u-conv-from-enc.h
diff options
context:
space:
mode:
authorAndreas Rottmann <a.rottmann@gmx.at>2010-05-27 18:23:15 +0200
committerAndreas Rottmann <a.rottmann@gmx.at>2010-05-27 18:23:15 +0200
commit3e0814cd9862b89c7a39672672937477bd87ddfb (patch)
tree159134a624e51509f40ed8823249f09a70d1dda3 /lib/uniconv/u-conv-from-enc.h
parent3bebb94360f1c2333feb8d504a9fa4f96984d8b7 (diff)
Imported Upstream version 0.9.3upstream/0.9.3
Diffstat (limited to 'lib/uniconv/u-conv-from-enc.h')
-rw-r--r--lib/uniconv/u-conv-from-enc.h44
1 files changed, 22 insertions, 22 deletions
diff --git a/lib/uniconv/u-conv-from-enc.h b/lib/uniconv/u-conv-from-enc.h
index fa0f0d3d..457bd0f8 100644
--- a/lib/uniconv/u-conv-from-enc.h
+++ b/lib/uniconv/u-conv-from-enc.h
@@ -1,5 +1,5 @@
/* Conversion to UTF-16/UTF-32 from legacy encodings.
- Copyright (C) 2002, 2006-2007, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2006-2007, 2009-2010 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
@@ -26,7 +26,7 @@ FUNC (const char *fromcode,
size_t length = *lengthp * sizeof (UNIT);
if (mem_iconveha (src, srclen, fromcode, UTF_NAME, true, handler,
- offsets, &result, &length) < 0)
+ offsets, &result, &length) < 0)
return NULL;
if (offsets != NULL)
{
@@ -35,8 +35,8 @@ FUNC (const char *fromcode,
size_t *o;
for (o = offsets; o < offsets_end; o++)
- if (*o != (size_t)(-1))
- *o = *o / sizeof (UNIT);
+ if (*o != (size_t)(-1))
+ *o = *o / sizeof (UNIT);
}
if ((length % sizeof (UNIT)) != 0)
abort ();
@@ -49,7 +49,7 @@ FUNC (const char *fromcode,
utf8_string =
u8_conv_from_encoding (fromcode, handler, src, srclen, offsets,
- NULL, &utf8_length);
+ NULL, &utf8_length);
if (utf8_string == NULL)
return NULL;
result = U8_TO_U (utf8_string, utf8_length, resultbuf, lengthp);
@@ -65,25 +65,25 @@ FUNC (const char *fromcode,
size_t length = *lengthp;
size_t *offsets_end = offsets + srclen;
size_t *o;
- size_t off8 = 0; /* offset into utf8_string */
- size_t offunit = 0; /* offset into result */
+ size_t off8 = 0; /* offset into utf8_string */
+ size_t offunit = 0; /* offset into result */
for (o = offsets; o < offsets_end; o++)
- if (*o != (size_t)(-1))
- {
- while (off8 < *o)
- {
- int count8 = u8_mblen (utf8_string + off8, utf8_length - off8);
- int countunit = U_MBLEN (result + offunit, length - offunit);
- if (count8 < 0 || countunit < 0)
- abort ();
- off8 += count8;
- offunit += countunit;
- }
- if (*o != off8)
- abort ();
- *o = offunit;
- }
+ if (*o != (size_t)(-1))
+ {
+ while (off8 < *o)
+ {
+ int count8 = u8_mblen (utf8_string + off8, utf8_length - off8);
+ int countunit = U_MBLEN (result + offunit, length - offunit);
+ if (count8 < 0 || countunit < 0)
+ abort ();
+ off8 += count8;
+ offunit += countunit;
+ }
+ if (*o != off8)
+ abort ();
+ *o = offunit;
+ }
}
free (utf8_string);
return result;