diff --git a/gobex/gobex-header.c b/gobex/gobex-header.c
index 061a1e0..a21362c 100644
--- a/gobex/gobex-header.c
+++ b/gobex/gobex-header.c
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;
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 dfce62c..9a8dd03 100644
--- a/gobex/gobex-header.h
+++ b/gobex/gobex-header.h
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 500a6c9..bdef980 100644
--- a/gobex/gobex-transfer.c
+++ b/gobex/gobex-transfer.c
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);
}
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 40c06cf..9ac5c95 100644
--- a/gobex/gobex.c
+++ b/gobex/gobex.c
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 33ebda3..27a2ab5 100644
--- a/unit/test-gobex-header.c
+++ b/unit/test-gobex-header.c
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));