From 1dc2ad6f0b7016fe8b61ef7c7314030823534139 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Wed, 29 Jun 2011 11:04:12 +0300 Subject: [PATCH] gobex: Use GLib size types --- gobex/gobex-header.c | 24 ++++++++++++------------ gobex/gobex-header.h | 10 +++++----- gobex/gobex-packet.c | 22 +++++++++++----------- gobex/gobex-packet.h | 12 +++++------- 4 files changed, 33 insertions(+), 35 deletions(-) diff --git a/gobex/gobex-header.c b/gobex/gobex-header.c index 5b0a50268..949e48a7d 100644 --- a/gobex/gobex-header.c +++ b/gobex/gobex-header.c @@ -34,8 +34,8 @@ struct _GObexHeader { guint8 id; gboolean extdata; - size_t vlen; /* Length of value */ - size_t hlen; /* Length of full encoded header */ + gsize vlen; /* Length of value */ + gsize hlen; /* Length of full encoded header */ union { char *string; /* UTF-8 converted from UTF-16 */ guint8 *data; /* Own buffer */ @@ -68,19 +68,19 @@ static glong utf8_to_utf16(gunichar2 **utf16, const char *utf8) { return utf16_len; } -static guint8 *put_bytes(guint8 *to, const void *from, size_t count) +static guint8 *put_bytes(guint8 *to, const void *from, gsize count) { memcpy(to, from, count); return (to + count); } -static const guint8 *get_bytes(void *to, const guint8 *from, size_t count) +static const guint8 *get_bytes(void *to, const guint8 *from, gsize count) { memcpy(to, from, count); return (from + count); } -size_t g_obex_header_encode(GObexHeader *header, void *buf, size_t buf_len) +gsize g_obex_header_encode(GObexHeader *header, void *buf, gsize buf_len) { guint8 *ptr = buf; guint16 u16; @@ -126,13 +126,13 @@ size_t g_obex_header_encode(GObexHeader *header, void *buf, size_t buf_len) return header->hlen; } -GObexHeader *g_obex_header_decode(const void *data, size_t len, - GObexDataPolicy data_policy, size_t *parsed) +GObexHeader *g_obex_header_decode(const void *data, gsize len, + GObexDataPolicy data_policy, gsize *parsed) { GObexHeader *header; const guint8 *ptr = data; guint16 hdr_len; - size_t str_len; + gsize str_len; if (len < 2) return NULL; @@ -156,7 +156,7 @@ GObexHeader *g_obex_header_decode(const void *data, size_t len, if (header->v.string == NULL) goto failed; - header->vlen = (size_t) str_len; + header->vlen = (gsize) str_len; header->hlen = hdr_len; *parsed = hdr_len; @@ -245,7 +245,7 @@ gboolean g_obex_header_get_unicode(GObexHeader *header, const char **str) } gboolean g_obex_header_get_bytes(GObexHeader *header, const guint8 **val, - size_t *len) + gsize *len) { if (G_OBEX_HDR_TYPE(header->id) != G_OBEX_HDR_TYPE_BYTES) return FALSE; @@ -283,7 +283,7 @@ gboolean g_obex_header_get_uint32(GObexHeader *header, guint32 *val) GObexHeader *g_obex_header_new_unicode(guint8 id, const char *str) { GObexHeader *header; - size_t len; + gsize len; if (G_OBEX_HDR_TYPE(id) != G_OBEX_HDR_TYPE_UNICODE) return NULL; @@ -301,7 +301,7 @@ GObexHeader *g_obex_header_new_unicode(guint8 id, const char *str) return header; } -GObexHeader *g_obex_header_new_bytes(guint8 id, void *data, size_t len, +GObexHeader *g_obex_header_new_bytes(guint8 id, void *data, gsize len, GObexDataPolicy data_policy) { GObexHeader *header; diff --git a/gobex/gobex-header.h b/gobex/gobex-header.h index 3abe5c697..b5b91007e 100644 --- a/gobex/gobex-header.h +++ b/gobex/gobex-header.h @@ -57,12 +57,12 @@ typedef struct _GObexHeader GObexHeader; gboolean g_obex_header_get_unicode(GObexHeader *header, const char **str); gboolean g_obex_header_get_bytes(GObexHeader *header, const guint8 **val, - size_t *len); + gsize *len); 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, size_t len, +GObexHeader *g_obex_header_new_bytes(guint8 id, void *data, gsize len, GObexDataPolicy data_policy); GObexHeader *g_obex_header_new_uint8(guint8 id, guint8 val); GObexHeader *g_obex_header_new_uint32(guint8 id, guint32 val); @@ -70,9 +70,9 @@ GObexHeader *g_obex_header_new_uint32(guint8 id, guint32 val); guint8 g_obex_header_get_id(GObexHeader *header); guint16 g_obex_header_get_length(GObexHeader *header); -size_t g_obex_header_encode(GObexHeader *header, void *hdr_ptr, size_t buf_len); -GObexHeader *g_obex_header_decode(const void *data, size_t len, - GObexDataPolicy data_policy, size_t *parsed); +gsize g_obex_header_encode(GObexHeader *header, void *hdr_ptr, gsize buf_len); +GObexHeader *g_obex_header_decode(const void *data, gsize len, + GObexDataPolicy data_policy, gsize *parsed); void g_obex_header_free(GObexHeader *header); #endif /* __GOBEX_HEADER_H */ diff --git a/gobex/gobex-packet.c b/gobex/gobex-packet.c index 9b03ce134..12acb70f3 100644 --- a/gobex/gobex-packet.c +++ b/gobex/gobex-packet.c @@ -34,9 +34,9 @@ struct _GObexPacket { void *buf; /* Non-header data */ const void *buf_ref; /* Reference to non-header data */ } data; - size_t data_len; + gsize data_len; - size_t hlen; /* Length of all encoded headers */ + gsize hlen; /* Length of all encoded headers */ GSList *headers; }; @@ -70,7 +70,7 @@ gboolean g_obex_packet_add_header(GObexPacket *pkt, GObexHeader *header) return TRUE; } -const void *g_obex_packet_get_data(GObexPacket *pkt, size_t *len) +const void *g_obex_packet_get_data(GObexPacket *pkt, gsize *len) { if (pkt->data_len == 0) { *len = 0; @@ -90,7 +90,7 @@ const void *g_obex_packet_get_data(GObexPacket *pkt, size_t *len) g_assert_not_reached(); } -gboolean g_obex_packet_set_data(GObexPacket *pkt, const void *data, size_t len, +gboolean g_obex_packet_set_data(GObexPacket *pkt, const void *data, gsize len, GObexDataPolicy data_policy) { if (pkt->data.buf || pkt->data.buf_ref) @@ -144,14 +144,14 @@ void g_obex_packet_free(GObexPacket *pkt) g_free(pkt); } -static gboolean parse_headers(GObexPacket *pkt, const void *data, size_t len, +static gboolean parse_headers(GObexPacket *pkt, const void *data, gsize len, GObexDataPolicy data_policy) { const guint8 *buf = data; while (len > 0) { GObexHeader *header; - size_t parsed; + gsize parsed; header = g_obex_header_decode(buf, len, data_policy, &parsed); if (header == NULL) @@ -166,14 +166,14 @@ static gboolean parse_headers(GObexPacket *pkt, const void *data, size_t len, return TRUE; } -static const guint8 *get_bytes(void *to, const guint8 *from, size_t count) +static const guint8 *get_bytes(void *to, const guint8 *from, gsize count) { memcpy(to, from, count); return (from + count); } -GObexPacket *g_obex_packet_decode(const void *data, size_t len, - size_t header_offset, +GObexPacket *g_obex_packet_decode(const void *data, gsize len, + gsize header_offset, GObexDataPolicy data_policy) { const guint8 *buf = data; @@ -223,9 +223,9 @@ failed: return NULL; } -ssize_t g_obex_packet_encode(GObexPacket *pkt, guint8 *buf, size_t len) +gssize g_obex_packet_encode(GObexPacket *pkt, guint8 *buf, gsize len) { - size_t count; + gsize count; guint16 pkt_len, u16; GSList *l; diff --git a/gobex/gobex-packet.h b/gobex/gobex-packet.h index ddce68607..908efac3d 100644 --- a/gobex/gobex-packet.h +++ b/gobex/gobex-packet.h @@ -22,8 +22,6 @@ #ifndef __GOBEX_PACKET_H #define __GOBEX_PACKET_H -#include - #include #include @@ -45,15 +43,15 @@ typedef struct _GObexPacket GObexPacket; GObexHeader *g_obex_packet_get_header(GObexPacket *pkt, guint8 id); guint8 g_obex_packet_get_operation(GObexPacket *pkt, gboolean *final); gboolean g_obex_packet_add_header(GObexPacket *pkt, GObexHeader *header); -gboolean g_obex_packet_set_data(GObexPacket *pkt, const void *data, size_t len, +gboolean g_obex_packet_set_data(GObexPacket *pkt, const void *data, gsize len, GObexDataPolicy data_policy); -const void *g_obex_packet_get_data(GObexPacket *pkt, size_t *len); +const void *g_obex_packet_get_data(GObexPacket *pkt, gsize *len); GObexPacket *g_obex_packet_new(guint8 opcode, gboolean final); void g_obex_packet_free(GObexPacket *pkt); -GObexPacket *g_obex_packet_decode(const void *data, size_t len, - size_t header_offset, +GObexPacket *g_obex_packet_decode(const void *data, gsize len, + gsize header_offset, GObexDataPolicy data_policy); -ssize_t g_obex_packet_encode(GObexPacket *pkt, guint8 *buf, size_t len); +gssize g_obex_packet_encode(GObexPacket *pkt, guint8 *buf, gsize len); #endif /* __GOBEX_PACKET_H */ -- 2.47.3