2010-10-15 11:46:18

by Dmitriy Paliy

Subject: [PATCH 0/1] Type conversion in read and write obex streams

Hi,

This is to correct previous patch on change of int32_t to ssize_t
types. Printing out is also fixed.

Br,
Dmitriy

2010-10-15 11:52:03

by Johan Hedberg

Subject: Re: [PATCH] Type conversion in read and write obex streams

Hi Dmitriy,

On Fri, Oct 15, 2010, Dmitriy Paliy wrote:
> Integer types in obex_write_stream and obex_read_stream shell be the
> same as those returned by read and write function prototypes of
> obex_mime_type_driver.
> ---
> src/obex.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)

Thanks. Pushed upstream.

Johan

2010-10-15 11:46:19

by Dmitriy Paliy

Subject: [PATCH] Type conversion in read and write obex streams

Integer types in obex_write_stream and obex_read_stream shell be the
same as those returned by read and write function prototypes of
obex_mime_type_driver.
---
src/obex.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/obex.c b/src/obex.c
index adfcc95..f37cd90 100644
--- a/src/obex.c
+++ b/src/obex.c
@@ -555,7 +555,7 @@ static int obex_read_stream(struct obex_session *os, obex_t *obex,
obex_object_t *obj)
{
int size;
- int32_t len = 0;
+ ssize_t len = 0;
const uint8_t *buffer;

DBG("name=%s type=%s rx_mtu=%d file=%p",
@@ -596,7 +596,7 @@ static int obex_read_stream(struct obex_session *os, obex_t *obex,

write:
while (os->pending > 0) {
- int w;
+ ssize_t w;

w = os->driver->write(os->object, os->buf + len,
os->pending);
@@ -622,7 +622,7 @@ static int obex_write_stream(struct obex_session *os,
{
obex_headerdata_t hd;
uint8_t *ptr;
- int32_t len;
+ ssize_t len;
unsigned int flags;
uint8_t hi;

@@ -644,7 +644,7 @@ static int obex_write_stream(struct obex_session *os,

len = os->driver->read(os->object, os->buf, os->tx_mtu, &hi);
if (len < 0) {
- error("read(): %s (%d)", strerror(-len), -len);
+ error("read(): %s (%zd)", strerror(-len), -len);
if (len == -EAGAIN)
return len;
else if (len == -ENOSTR)
--
1.7.0.4

2010-10-15 11:10:17

by Johan Hedberg

Subject: Re: [PATCH] Type conversion in read and write obex streams

Hi Dmitriy,

On Fri, Oct 15, 2010, Dmitriy Paliy wrote:
> Integer types in obex_write_stream and obex_read_stream shell be the
> same as those returned by read and write function prototypes of
> obex_mime_type_driver.
> ---
> src/obex.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)

Not good:

src/obex.c: In function ‘obex_write_stream’:
src/obex.c:647: error: format ‘%d’ expects type ‘int’, but argument 3 has type ‘ssize_t’

Always compile-check your patches with ./bootstrap-configure.

The correct format specifier for ssize_t is %zd

Johan