From f5d10bf7cbd165df4f40ac15e73391c40a0cccad Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Sun, 10 Jul 2011 13:57:55 +0300 Subject: [PATCH] gobex: Remove unneeded data_policy from g_obex_header_new_bytes --- gobex/gobex-header.c | 17 ++--------------- gobex/gobex-header.h | 3 +-- gobex/gobex-transfer.c | 6 ++---- gobex/gobex.c | 3 +-- unit/test-gobex-header.c | 2 +- 5 files changed, 7 insertions(+), 24 deletions(-) diff --git a/gobex/gobex-header.c b/gobex/gobex-header.c index 061a1e0cd..a21362c6f 100644 --- a/gobex/gobex-header.c +++ b/gobex/gobex-header.c @@ -337,8 +337,7 @@ GObexHeader *g_obex_header_new_unicode(guint8 id, const char *str) return header; } -GObexHeader *g_obex_header_new_bytes(guint8 id, void *data, gsize len, - GObexDataPolicy data_policy) +GObexHeader *g_obex_header_new_bytes(guint8 id, void *data, gsize len) { GObexHeader *header; @@ -350,19 +349,7 @@ GObexHeader *g_obex_header_new_bytes(guint8 id, void *data, gsize len, header->id = id; header->vlen = len; header->hlen = len + 3; - - switch (data_policy) { - case G_OBEX_DATA_INHERIT: - header->v.data = data; - break; - case G_OBEX_DATA_COPY: - header->v.data = g_memdup(data, len); - break; - case G_OBEX_DATA_REF: - header->extdata = TRUE; - header->v.extdata = data; - break; - } + header->v.data = g_memdup(data, len); return header; } diff --git a/gobex/gobex-header.h b/gobex/gobex-header.h index dfce62c9d..9a8dd038c 100644 --- a/gobex/gobex-header.h +++ b/gobex/gobex-header.h @@ -62,8 +62,7 @@ gboolean g_obex_header_get_uint8(GObexHeader *header, guint8 *val); gboolean g_obex_header_get_uint32(GObexHeader *header, guint32 *val); GObexHeader *g_obex_header_new_unicode(guint8 id, const char *str); -GObexHeader *g_obex_header_new_bytes(guint8 id, void *data, gsize len, - GObexDataPolicy data_policy); +GObexHeader *g_obex_header_new_bytes(guint8 id, void *data, gsize len); GObexHeader *g_obex_header_new_uint8(guint8 id, guint8 val); GObexHeader *g_obex_header_new_uint32(guint8 id, guint32 val); diff --git a/gobex/gobex-transfer.c b/gobex/gobex-transfer.c index 500a6c9fc..bdef9800a 100644 --- a/gobex/gobex-transfer.c +++ b/gobex/gobex-transfer.c @@ -207,8 +207,7 @@ guint g_obex_put_req(GObex *obex, const char *type, const char *name, if (type) { hdr = g_obex_header_new_bytes(G_OBEX_HDR_ID_TYPE, - (char *) type, strlen(type) + 1, - G_OBEX_DATA_COPY); + (char *) type, strlen(type) + 1); g_obex_packet_add_header(req, hdr); } @@ -318,8 +317,7 @@ guint g_obex_get_req(GObex *obex, const char *type, const char *name, if (type) { hdr = g_obex_header_new_bytes(G_OBEX_HDR_ID_TYPE, - (char *) type, strlen(type) + 1, - G_OBEX_DATA_COPY); + (char *) type, strlen(type) + 1); g_obex_packet_add_header(req, hdr); } diff --git a/gobex/gobex.c b/gobex/gobex.c index 40c06cfbd..9ac5c9590 100644 --- a/gobex/gobex.c +++ b/gobex/gobex.c @@ -921,8 +921,7 @@ guint g_obex_connect(GObex *obex, void *target, gsize target_len, if (target != NULL) { GObexHeader *hdr; hdr = g_obex_header_new_bytes(G_OBEX_HDR_ID_TARGET, - target, target_len, - G_OBEX_DATA_COPY); + target, target_len); g_obex_packet_add_header(req, hdr); } diff --git a/unit/test-gobex-header.c b/unit/test-gobex-header.c index 33ebda3b5..27a2ab5e1 100644 --- a/unit/test-gobex-header.c +++ b/unit/test-gobex-header.c @@ -87,7 +87,7 @@ static void test_header_bytes(void) size_t len; header = g_obex_header_new_bytes(G_OBEX_HDR_ID_BODY, data, - sizeof(data), G_OBEX_DATA_REF); + sizeof(data)); g_assert(header != NULL); len = g_obex_header_encode(header, buf, sizeof(buf)); -- 2.47.3