Module Name: src
Committed By: sborrill
Date: Fri Oct 26 09:02:28 UTC 2012
Modified Files:
src/sbin/gpt [netbsd-6]: gpt.c
Log Message:
Pull up the following revisions(s) (requested by riz in ticket #619):
sbin/gpt/gpt.c: revision 1.16-1.17
Endianness fixes.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.4.1 src/sbin/gpt/gpt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/gpt.c
diff -u src/sbin/gpt/gpt.c:1.15 src/sbin/gpt/gpt.c:1.15.4.1
--- src/sbin/gpt/gpt.c:1.15 Sat Aug 27 17:38:16 2011
+++ src/sbin/gpt/gpt.c Fri Oct 26 09:02:27 2012
@@ -31,7 +31,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.16 2006/07/07 02:44:23 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: gpt.c,v 1.15 2011/08/27 17:38:16 joerg Exp $");
+__RCSID("$NetBSD: gpt.c,v 1.15.4.1 2012/10/26 09:02:27 sborrill Exp $");
#endif
#include <sys/param.h>
@@ -196,7 +196,7 @@ utf8_to_utf16(const uint8_t *s8, uint16_
/* Initial characters. */
if (utfbytes != 0) {
/* Incomplete encoding. */
- s16[s16idx++] = 0xfffd;
+ s16[s16idx++] = htole16(0xfffd);
if (s16idx == s16len) {
s16[--s16idx] = 0;
return;
@@ -227,10 +227,12 @@ utf8_to_utf16(const uint8_t *s8, uint16_
if (utfchar >= 0x10000 && s16idx + 2 >= s16len)
utfchar = 0xfffd;
if (utfchar >= 0x10000) {
- s16[s16idx++] = 0xd800 | ((utfchar>>10)-0x40);
- s16[s16idx++] = 0xdc00 | (utfchar & 0x3ff);
+ s16[s16idx++] =
+ htole16(0xd800 | ((utfchar>>10)-0x40));
+ s16[s16idx++] =
+ htole16(0xdc00 | (utfchar & 0x3ff));
} else
- s16[s16idx++] = utfchar;
+ s16[s16idx++] = htole16(utfchar);
if (s16idx == s16len) {
s16[--s16idx] = 0;
return;
