upgrade obexd to 0.47

[profile/ivi/obexd.git] / gobex / gobex-header.c

diff --git a/gobex/gobex-header.c b/gobex/gobex-header.c
index 035725b..56dd9b2 100644 (file)
--- a/gobex/gobex-header.c
+++ b/gobex/gobex-header.c
@@ -109,23 +109,23 @@ gssize g_obex_header_encode(GObexHeader *header, void *buf, gsize buf_len)
                g_assert_cmpuint(utf16_len + 3, ==, header->hlen);
                u16 = g_htons(utf16_len + 3);
                ptr = put_bytes(ptr, &u16, sizeof(u16));
-               ptr = put_bytes(ptr, utf16, utf16_len);
+               put_bytes(ptr, utf16, utf16_len);
                g_free(utf16);
                break;
        case G_OBEX_HDR_ENC_BYTES:
                u16 = g_htons(header->hlen);
                ptr = put_bytes(ptr, &u16, sizeof(u16));
                if (header->extdata)
-                       ptr = put_bytes(ptr, header->v.extdata, header->vlen);
+                       put_bytes(ptr, header->v.extdata, header->vlen);
                else
-                       ptr = put_bytes(ptr, header->v.data, header->vlen);
+                       put_bytes(ptr, header->v.data, header->vlen);
                break;
        case G_OBEX_HDR_ENC_UINT8:
                *ptr = header->v.u8;
                break;
        case G_OBEX_HDR_ENC_UINT32:
                u32 = g_htonl(header->v.u32);
-               ptr = put_bytes(ptr, &u32, sizeof(u32));
+               put_bytes(ptr, &u32, sizeof(u32));
                break;
        default:
                g_assert_not_reached();
@@ -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,
@@ -263,7 +263,7 @@ GObexHeader *g_obex_header_decode(const void *data, gsize len,
                }
                header->vlen = 4;
                header->hlen = 5;
-               ptr = get_bytes(&header->v.u32, ptr, sizeof(header->v.u32));
+               get_bytes(&header->v.u32, ptr, sizeof(header->v.u32));
                header->v.u32 = g_ntohl(header->v.u32);
                *parsed = 5;
                break;