projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
utf8.c
diff --git
a/utf8.c
b/utf8.c
index
bed31ab
..
c25a84b
100644
(file)
--- a/
utf8.c
+++ b/
utf8.c
@@
-1,3
+1,12
@@
+/*
+ * Copyright notice from original mutt:
+ * [none]
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
+ */
+
#if HAVE_CONFIG_H
# include "config.h"
#endif
#if HAVE_CONFIG_H
# include "config.h"
#endif
@@
-12,35
+21,28
@@
int mutt_wctoutf8 (char *s, unsigned int c)
{
int mutt_wctoutf8 (char *s, unsigned int c)
{
- if (c < (1 << 7))
- {
+ if (c < (1 << 7)) {
if (s)
*s++ = c;
return 1;
}
if (s)
*s++ = c;
return 1;
}
- else if (c < (1 << 11))
- {
- if (s)
- {
+ else if (c < (1 << 11)) {
+ if (s) {
*s++ = 0xc0 | (c >> 6);
*s++ = 0x80 | (c & 0x3f);
}
return 2;
}
*s++ = 0xc0 | (c >> 6);
*s++ = 0x80 | (c & 0x3f);
}
return 2;
}
- else if (c < (1 << 16))
- {
- if (s)
- {
+ else if (c < (1 << 16)) {
+ if (s) {
*s++ = 0xe0 | (c >> 12);
*s++ = 0x80 | ((c >> 6) & 0x3f);
*s++ = 0x80 | (c & 0x3f);
}
return 3;
}
*s++ = 0xe0 | (c >> 12);
*s++ = 0x80 | ((c >> 6) & 0x3f);
*s++ = 0x80 | (c & 0x3f);
}
return 3;
}
- else if (c < (1 << 21))
- {
- if (s)
- {
+ else if (c < (1 << 21)) {
+ if (s) {
*s++ = 0xf0 | (c >> 18);
*s++ = 0x80 | ((c >> 12) & 0x3f);
*s++ = 0x80 | ((c >> 6) & 0x3f);
*s++ = 0xf0 | (c >> 18);
*s++ = 0x80 | ((c >> 12) & 0x3f);
*s++ = 0x80 | ((c >> 6) & 0x3f);
@@
-48,10
+50,8
@@
int mutt_wctoutf8 (char *s, unsigned int c)
}
return 4;
}
}
return 4;
}
- else if (c < (1 << 26))
- {
- if (s)
- {
+ else if (c < (1 << 26)) {
+ if (s) {
*s++ = 0xf8 | (c >> 24);
*s++ = 0x80 | ((c >> 18) & 0x3f);
*s++ = 0x80 | ((c >> 12) & 0x3f);
*s++ = 0xf8 | (c >> 24);
*s++ = 0x80 | ((c >> 18) & 0x3f);
*s++ = 0x80 | ((c >> 12) & 0x3f);
@@
-60,10
+60,8
@@
int mutt_wctoutf8 (char *s, unsigned int c)
}
return 5;
}
}
return 5;
}
- else if (c < (1 << 31))
- {
- if (s)
- {
+ else if (c < (1 << 31)) {
+ if (s) {
*s++ = 0xfc | (c >> 30);
*s++ = 0x80 | ((c >> 24) & 0x3f);
*s++ = 0x80 | ((c >> 18) & 0x3f);
*s++ = 0xfc | (c >> 30);
*s++ = 0x80 | ((c >> 24) & 0x3f);
*s++ = 0x80 | ((c >> 18) & 0x3f);