FlapJackApps/libdivecomputer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the public API return the size of the downloaded data.

Browse Source 
And renamed a few variables to make the code more consistent with code 
elsewhere in the library.
This commit is contained in:
Jef Driesen 2008-05-23 20:36:31 +00:00
parent 1d50bcf732
commit 987b785de4
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
uwatec_smart.c
View File

@ -165,7 +165,7 @@ uwatec_smart_transfer (smart *device, const unsigned char command[], unsigned in
int
uwatec_smart_read (smart *device, unsigned char data[], unsigned int msize)
uwatec_smart_read (smart *device, unsigned char data[], unsigned int size)
{
if (device == NULL)
return UWATEC_ERROR;
@ -265,14 +265,14 @@ uwatec_smart_read (smart *device, unsigned char data[], unsigned int msize)
if (rc != UWATEC_SUCCESS)
return rc;
unsigned int size = answer[0] + (answer[1] << 8) +
unsigned int length = answer[0] + (answer[1] << 8) +
(answer[2] << 16) + (answer[3] << 24);
message ("handshake: size=%u\n", size);
message ("handshake: length=%u\n", length);
if (size == 0)
return UWATEC_SUCCESS;
if (length == 0)
return 0;
unsigned char *package = malloc (size * sizeof (unsigned char));
unsigned char *package = malloc (length * sizeof (unsigned char));
if (package == NULL) {
WARNING ("Memory allocation error.");
return UWATEC_ERROR_MEMORY;
@ -296,15 +296,15 @@ uwatec_smart_read (smart *device, unsigned char data[], unsigned int msize)
return rc;
}
unsigned int length = answer[0] + (answer[1] << 8) +
unsigned int total = answer[0] + (answer[1] << 8) +
(answer[2] << 16) + (answer[3] << 24);
message ("handshake: size=%u\n", length);
message ("handshake: total=%u\n", total);
assert (length == size + 4);
assert (total == length + 4);
unsigned int nbytes = 0;
while (nbytes < size) {
unsigned int len = size - nbytes;
while (nbytes < length) {
unsigned int len = length - nbytes;
if (len > 32)
len = 32;
rc = irda_socket_read (device->socket, package + nbytes, len);
@ -317,16 +317,16 @@ uwatec_smart_read (smart *device, unsigned char data[], unsigned int msize)
message ("len=%u, rc=%i, nbytes=%u\n", len, rc, nbytes);
}
if (size <= msize) {
memcpy (data, package, size);
if (length <= size) {
memcpy (data, package, length);
} else {
message ("Insufficient buffer space available.\n");
memcpy (data, package, msize);
memcpy (data, package, size);
}
free (package);
return UWATEC_SUCCESS;
return length;
}

4
uwatec_smart_test.c
View File

@ -31,7 +31,7 @@ int test_dump_memory (const char* filename)
message ("uwatec_smart_read\n");
rc = uwatec_smart_read (device, data, size);
if (rc != UWATEC_SUCCESS) {
if (rc < 0) {
WARNING ("Cannot read data.");
uwatec_smart_close (device);
free (data);
@ -41,7 +41,7 @@ int test_dump_memory (const char* filename)
message ("Dumping data\n");
FILE* fp = fopen (filename, "wb");
if (fp != NULL) {
fwrite (data, sizeof (unsigned char), size, fp);
fwrite (data, sizeof (unsigned char), rc, fp);
fclose (fp);
}