Skip to contentSkip to conversation

UTF8 to UTF-8 name patch for obexd

PATCH Neal Peacock 2 participants 2 messages Jun 29, 2012 – Jun 30, 2012 Bluetooth drivers

lore
Share & tools
lore
#0 lore raw

My first post here so I hope I am doing this the right way.

This is a short patch for obexd to change the charset name passed into glib from UTF8 to UTF-8, which I think is the proper name. I was working on an embedded system that didn't have the aliases setup to convert the names like typical desktops. I was pulling my hair out trying to figure out how to add the charsets in glib until I realized I could just change the name in obexd and UTF-8 seems to be universally included unlike UTF8.

Thanks.

--
Neal Peacock

Quoted 1 line

From abe899bbdeac414610970cdcad31dc2d02463085 Mon Sep 17 00:00:00 2001

From: Neal Peacock <[email protected]>
Date: Fri, 29 Jun 2012 18:15:57 -0400
Subject: [PATCH] Changed UTF name to standard

---
 gobex/gobex-header.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
gobex/gobex-header.c +1 -1
index 77dcc6e..56dd9b2 100644
@@ -187,7 +187,7 @@ GObexHeader *g_obex_header_decode(const void *data, gsize len,
 		}
 
 		header->v.string = g_convert((const char *) ptr, hdr_len - 5,
-						"UTF8", "UTF16BE",
+						"UTF-8", "UTF-16BE",
 						NULL, &str_len, &conv_err);
 		if (header->v.string == NULL) {
 			g_set_error(err, G_OBEX_ERROR,
Signature · 1 line
1.7.2.5
#1 lore raw

Hi Neal,

Quoted 11 lines · Neal Peacock

Subject: [PATCH] Changed UTF name to standard

---
 gobex/gobex-header.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
gobex/gobex-header.c +0 -0
index 77dcc6e..56dd9b2 100644

gobex/gobex-header.c GObexHeader *g_obex_header_decode(const void *data, gsize len, · line 193

Quoted 8 lines
gobex/gobex-header.c +1 -1
@@ -187,7 +187,7 @@ GObexHeader *g_obex_header_decode(const void *data, gsize len,
 		}
 
 		header->v.string = g_convert((const char *) ptr, hdr_len - 5,
-						"UTF8", "UTF16BE",
+						"UTF-8", "UTF-16BE",
 						NULL, &str_len, &conv_err);
 		if (header->v.string == NULL) {
 			g_set_error(err, G_OBEX_ERROR,

The patch looks good and has been applied to obexd.git. Thanks.

Johan