summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Tytgat <joty@netsurf-browser.org>2008-06-28 14:20:50 +0000
committerJohn Tytgat <joty@netsurf-browser.org>2008-06-28 14:20:50 +0000
commitd7428881c86e1b1305f6d52a9a7a3af5dd5afa37 (patch)
tree018ccf4c94f2d0fe661e445a5de4d05cb611f819
parentbbbdd1e8779bb359060f4104699994ef5d21877e (diff)
downloadlibparserutils-d7428881c86e1b1305f6d52a9a7a3af5dd5afa37.tar.gz
libparserutils-d7428881c86e1b1305f6d52a9a7a3af5dd5afa37.tar.bz2
Pedantic spelling changes of encoding names UTF-8, UTF-16 and UCS-4
svn path=/trunk/libparserutils/; revision=4469
-rw-r--r--include/parserutils/charset/codec.h6
-rw-r--r--include/parserutils/input/inputstream.h2
-rw-r--r--src/charset/codec.c4
-rw-r--r--src/charset/codecs/codec_iconv.c14
-rw-r--r--src/charset/codecs/codec_utf16.c16
-rw-r--r--src/charset/codecs/codec_utf8.c16
-rw-r--r--src/charset/encodings/utf16.c6
-rw-r--r--src/charset/encodings/utf8.c6
-rw-r--r--src/charset/encodings/utf8impl.h6
9 files changed, 38 insertions, 38 deletions
diff --git a/include/parserutils/charset/codec.h b/include/parserutils/charset/codec.h
index ca98db5..9bf2ce7 100644
--- a/include/parserutils/charset/codec.h
+++ b/include/parserutils/charset/codec.h
@@ -23,7 +23,7 @@ typedef struct parserutils_charset_codec parserutils_charset_codec;
* A codec's error mode determines its behaviour in the face of:
*
* + characters which are unrepresentable in the destination charset (if
- * encoding data) or which cannot be converted to UCS4 (if decoding data).
+ * encoding data) or which cannot be converted to UCS-4 (if decoding data).
* + invalid byte sequences (both encoding and decoding)
*
* The options provide a choice between the following approaches:
@@ -95,13 +95,13 @@ parserutils_error parserutils_charset_codec_setopt(
parserutils_charset_codec_opttype type,
parserutils_charset_codec_optparams *params);
-/* Encode a chunk of UCS4 data into a codec's charset */
+/* Encode a chunk of UCS-4 data into a codec's charset */
parserutils_error parserutils_charset_codec_encode(
parserutils_charset_codec *codec,
const uint8_t **source, size_t *sourcelen,
uint8_t **dest, size_t *destlen);
-/* Decode a chunk of data in a codec's charset into UCS4 */
+/* Decode a chunk of data in a codec's charset into UCS-4 */
parserutils_error parserutils_charset_codec_decode(
parserutils_charset_codec *codec,
const uint8_t **source, size_t *sourcelen,
diff --git a/include/parserutils/input/inputstream.h b/include/parserutils/input/inputstream.h
index 2b0c407..db81eb0 100644
--- a/include/parserutils/input/inputstream.h
+++ b/include/parserutils/input/inputstream.h
@@ -30,7 +30,7 @@ typedef parserutils_error (*parserutils_charset_detect_func)(
*/
typedef struct parserutils_inputstream
{
- parserutils_buffer *utf8; /**< Buffer containing utf8 data */
+ parserutils_buffer *utf8; /**< Buffer containing UTF-8 data */
uint32_t cursor; /**< Byte offset of current position */
diff --git a/src/charset/codec.c b/src/charset/codec.c
index 5c3fb3a..b1e2e4a 100644
--- a/src/charset/codec.c
+++ b/src/charset/codec.c
@@ -117,7 +117,7 @@ parserutils_error parserutils_charset_codec_setopt(
}
/**
- * Encode a chunk of UCS4 data into a codec's charset
+ * Encode a chunk of UCS-4 data into a codec's charset
*
* \param codec The codec to use
* \param source Pointer to pointer to source data
@@ -142,7 +142,7 @@ parserutils_error parserutils_charset_codec_encode(
}
/**
- * Decode a chunk of data in a codec's charset into UCS4
+ * Decode a chunk of data in a codec's charset into UCS-4
*
* \param codec The codec to use
* \param source Pointer to pointer to source data
diff --git a/src/charset/codecs/codec_iconv.c b/src/charset/codecs/codec_iconv.c
index bbe8bc4..3b612d2 100644
--- a/src/charset/codecs/codec_iconv.c
+++ b/src/charset/codecs/codec_iconv.c
@@ -161,7 +161,7 @@ void iconv_codec_destroy (parserutils_charset_codec *codec)
}
/**
- * Encode a chunk of UCS4 data into an iconv-based codec's charset
+ * Encode a chunk of UCS-4 data into an iconv-based codec's charset
*
* \param codec The codec to use
* \param source Pointer to pointer to source data
@@ -271,7 +271,7 @@ parserutils_error iconv_codec_encode(parserutils_charset_codec *codec,
}
/**
- * Decode a chunk of data in an iconv-based codec's charset into UCS4
+ * Decode a chunk of data in an iconv-based codec's charset into UCS-4
*
* \param codec The codec to use
* \param source Pointer to pointer to source data
@@ -419,10 +419,10 @@ parserutils_error iconv_codec_reset(parserutils_charset_codec *codec)
}
/**
- * Output a UCS4 character
+ * Output a UCS-4 character
*
* \param c Codec to use
- * \param ucs4 UCS4 character (big endian)
+ * \param ucs4 UCS-4 character (big endian)
* \param dest Pointer to pointer to output buffer
* \param destlen Pointer to output buffer length
* \return PARSERUTILS_OK on success,
@@ -448,7 +448,7 @@ parserutils_error iconv_codec_output_decoded_char(iconv_codec *c,
}
/**
- * Read a character from the codec's native charset to UCS4 (big endian)
+ * Read a character from the codec's native charset to UCS-4 (big endian)
*
* \param c The codec
* \param source Pointer to pointer to source buffer (updated on exit)
@@ -600,10 +600,10 @@ parserutils_error iconv_codec_read_char(iconv_codec *c,
}
/**
- * Write a UCS4 character in a codec's native charset
+ * Write a UCS-4 character in a codec's native charset
*
* \param c The codec
- * \param ucs4 The UCS4 character to write (big endian)
+ * \param ucs4 The UCS-4 character to write (big endian)
* \param dest Pointer to pointer to output buffer (updated on exit)
* \param destlen Pointer to length of output buffer (updated on exit)
* \return PARSERUTILS_OK on success,
diff --git a/src/charset/codecs/codec_utf16.c b/src/charset/codecs/codec_utf16.c
index 0dd7a07..65f4d1a 100644
--- a/src/charset/codecs/codec_utf16.c
+++ b/src/charset/codecs/codec_utf16.c
@@ -80,7 +80,7 @@ bool charset_utf16_codec_handles_charset(const char *charset)
}
/**
- * Create a utf16 codec
+ * Create a UTF-16 codec
*
* \param charset The charset to read from / write to
* \param alloc Memory (de)allocation function
@@ -117,7 +117,7 @@ parserutils_charset_codec *charset_utf16_codec_create(const char *charset,
}
/**
- * Destroy a utf16 codec
+ * Destroy a UTF-16 codec
*
* \param codec The codec to destroy
*/
@@ -127,7 +127,7 @@ void charset_utf16_codec_destroy (parserutils_charset_codec *codec)
}
/**
- * Encode a chunk of UCS4 data into utf16
+ * Encode a chunk of UCS-4 data into UTF-16
*
* \param codec The codec to use
* \param source Pointer to pointer to source data
@@ -246,7 +246,7 @@ parserutils_error charset_utf16_codec_encode(parserutils_charset_codec *codec,
}
/**
- * Decode a chunk of utf16 data into UCS4
+ * Decode a chunk of UTF-16 data into UCS-4
*
* \param codec The codec to use
* \param source Pointer to pointer to source data
@@ -366,7 +366,7 @@ parserutils_error charset_utf16_codec_decode(parserutils_charset_codec *codec,
}
/**
- * Clear a utf16 codec's encoding state
+ * Clear a UTF-16 codec's encoding state
*
* \param codec The codec to reset
* \return PARSERUTILS_OK on success, appropriate error otherwise
@@ -389,7 +389,7 @@ parserutils_error charset_utf16_codec_reset(parserutils_charset_codec *codec)
/**
- * Read a character from the UTF-16 to UCS4 (big endian)
+ * Read a character from the UTF-16 to UCS-4 (big endian)
*
* \param c The codec
* \param source Pointer to pointer to source buffer (updated on exit)
@@ -510,10 +510,10 @@ parserutils_error charset_utf16_codec_read_char(charset_utf16_codec *c,
}
/**
- * Output a UCS4 character
+ * Output a UCS-4 character
*
* \param c Codec to use
- * \param ucs4 UCS4 character (host endian)
+ * \param ucs4 UCS-4 character (host endian)
* \param dest Pointer to pointer to output buffer
* \param destlen Pointer to output buffer length
* \return PARSERUTILS_OK on success,
diff --git a/src/charset/codecs/codec_utf8.c b/src/charset/codecs/codec_utf8.c
index 838d051..6ff90c5 100644
--- a/src/charset/codecs/codec_utf8.c
+++ b/src/charset/codecs/codec_utf8.c
@@ -81,7 +81,7 @@ bool charset_utf8_codec_handles_charset(const char *charset)
}
/**
- * Create a utf8 codec
+ * Create a UTF-8 codec
*
* \param charset The charset to read from / write to
* \param alloc Memory (de)allocation function
@@ -118,7 +118,7 @@ parserutils_charset_codec *charset_utf8_codec_create(const char *charset,
}
/**
- * Destroy a utf8 codec
+ * Destroy a UTF-8 codec
*
* \param codec The codec to destroy
*/
@@ -128,7 +128,7 @@ void charset_utf8_codec_destroy (parserutils_charset_codec *codec)
}
/**
- * Encode a chunk of UCS4 data into utf8
+ * Encode a chunk of UCS-4 data into UTF-8
*
* \param codec The codec to use
* \param source Pointer to pointer to source data
@@ -232,7 +232,7 @@ parserutils_error charset_utf8_codec_encode(parserutils_charset_codec *codec,
}
/**
- * Decode a chunk of utf8 data into UCS4
+ * Decode a chunk of UTF-8 data into UCS-4
*
* \param codec The codec to use
* \param source Pointer to pointer to source data
@@ -352,7 +352,7 @@ parserutils_error charset_utf8_codec_decode(parserutils_charset_codec *codec,
}
/**
- * Clear a utf8 codec's encoding state
+ * Clear a UTF-8 codec's encoding state
*
* \param codec The codec to reset
* \return PARSERUTILS_OK on success, appropriate error otherwise
@@ -375,7 +375,7 @@ parserutils_error charset_utf8_codec_reset(parserutils_charset_codec *codec)
/**
- * Read a character from the UTF-8 to UCS4 (big endian)
+ * Read a character from the UTF-8 to UCS-4 (big endian)
*
* \param c The codec
* \param source Pointer to pointer to source buffer (updated on exit)
@@ -511,10 +511,10 @@ parserutils_error charset_utf8_codec_read_char(charset_utf8_codec *c,
}
/**
- * Output a UCS4 character
+ * Output a UCS-4 character
*
* \param c Codec to use
- * \param ucs4 UCS4 character (host endian)
+ * \param ucs4 UCS-4 character (host endian)
* \param dest Pointer to pointer to output buffer
* \param destlen Pointer to output buffer length
* \return PARSERUTILS_OK on success,
diff --git a/src/charset/encodings/utf16.c b/src/charset/encodings/utf16.c
index 95dc64f..59cb146 100644
--- a/src/charset/encodings/utf16.c
+++ b/src/charset/encodings/utf16.c
@@ -16,11 +16,11 @@
#include <parserutils/charset/utf16.h>
/**
- * Convert a UTF-16 sequence into a single UCS4 character
+ * Convert a UTF-16 sequence into a single UCS-4 character
*
* \param s The sequence to process
* \param len Length of sequence
- * \param ucs4 Pointer to location to receive UCS4 character (host endian)
+ * \param ucs4 Pointer to location to receive UCS-4 character (host endian)
* \param clen Pointer to location to receive byte length of UTF-16 sequence
* \return PARSERUTILS_OK on success, appropriate error otherwise
*/
@@ -55,7 +55,7 @@ parserutils_error parserutils_charset_utf16_to_ucs4(const uint8_t *s,
}
/**
- * Convert a single UCS4 character into a UTF-16 sequence
+ * Convert a single UCS-4 character into a UTF-16 sequence
*
* \param ucs4 The character to process (0 <= c <= 0x7FFFFFFF) (host endian)
* \param s Pointer to 4 byte long output buffer
diff --git a/src/charset/encodings/utf8.c b/src/charset/encodings/utf8.c
index 5b4ba95..7d8ca6a 100644
--- a/src/charset/encodings/utf8.c
+++ b/src/charset/encodings/utf8.c
@@ -37,14 +37,14 @@ const uint8_t numContinuations[256] = {
};
/**
- * Convert a UTF-8 multibyte sequence into a single UCS4 character
+ * Convert a UTF-8 multibyte sequence into a single UCS-4 character
*
* Encoding of UCS values outside the UTF-16 plane has been removed from
* RFC3629. This function conforms to RFC2279, however.
*
* \param s The sequence to process
* \param len Length of sequence
- * \param ucs4 Pointer to location to receive UCS4 character (host endian)
+ * \param ucs4 Pointer to location to receive UCS-4 character (host endian)
* \param clen Pointer to location to receive byte length of UTF-8 sequence
* \return PARSERUTILS_OK on success, appropriate error otherwise
*/
@@ -59,7 +59,7 @@ parserutils_error parserutils_charset_utf8_to_ucs4(const uint8_t *s, size_t len,
}
/**
- * Convert a single UCS4 character into a UTF-8 multibyte sequence
+ * Convert a single UCS-4 character into a UTF-8 multibyte sequence
*
* Encoding of UCS values outside the UTF-16 plane has been removed from
* RFC3629. This function conforms to RFC2279, however.
diff --git a/src/charset/encodings/utf8impl.h b/src/charset/encodings/utf8impl.h
index 1ca9de7..b1721c7 100644
--- a/src/charset/encodings/utf8impl.h
+++ b/src/charset/encodings/utf8impl.h
@@ -20,14 +20,14 @@
extern const uint8_t numContinuations[256];
/**
- * Convert a UTF-8 multibyte sequence into a single UCS4 character
+ * Convert a UTF-8 multibyte sequence into a single UCS-4 character
*
* Encoding of UCS values outside the UTF-16 plane has been removed from
* RFC3629. This macro conforms to RFC2279, however.
*
* \param s The sequence to process
* \param len Length of sequence
- * \param ucs4 Pointer to location to receive UCS4 character (host endian)
+ * \param ucs4 Pointer to location to receive UCS-4 character (host endian)
* \param clen Pointer to location to receive byte length of UTF-8 sequence
* \param error Location to receive error code
*/
@@ -109,7 +109,7 @@ do { \
} while(0)
/**
- * Convert a single UCS4 character into a UTF-8 multibyte sequence
+ * Convert a single UCS-4 character into a UTF-8 multibyte sequence
*
* Encoding of UCS values outside the UTF-16 plane has been removed from
* RFC3629. This macro conforms to RFC2279, however.