summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2012-10-08 20:34:34 +0100
committerMichael Drake <tlsa@netsurf-browser.org>2012-10-08 20:34:34 +0100
commit9d29c8b48a278c466299aedd4245f8dd62cccf52 (patch)
tree59d21b506750a548981a1133827574cb635f9538 /utils
parentce577f4dc491f6d88a4da2105d08080e8d51357f (diff)
parent5800789df23dd5fd42c1abc161f4d53d290352e5 (diff)
downloadnetsurf-9d29c8b48a278c466299aedd4245f8dd62cccf52.tar.gz
netsurf-9d29c8b48a278c466299aedd4245f8dd62cccf52.tar.bz2
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
Diffstat (limited to 'utils')
-rw-r--r--utils/hashtable.c6
-rw-r--r--utils/utf8.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/utils/hashtable.c b/utils/hashtable.c
index d9071cedc..05cc71570 100644
--- a/utils/hashtable.c
+++ b/utils/hashtable.c
@@ -32,9 +32,9 @@
struct hash_entry {
- char *pairing; /**< block containing '<key>\0<value>\0' */
- unsigned int key_length; /**< length of key */
- struct hash_entry *next; /**< next entry */
+ char *pairing; /**< block containing 'key\0value\0' */
+ unsigned int key_length; /**< length of key */
+ struct hash_entry *next; /**< next entry */
};
struct hash_table {
diff --git a/utils/utf8.c b/utils/utf8.c
index 3cdea047c..5c27fa7c6 100644
--- a/utils/utf8.c
+++ b/utils/utf8.c
@@ -42,7 +42,7 @@ static utf8_convert_ret utf8_convert(const char *string, size_t len,
* 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 s_in The sequence to process
* \param l Length of sequence
* \return UCS4 character
*/