ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-04-27 22:40:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Android compiler warnings ("%zd" and ssize_t)

Browse Source 
Also squash some unconditional DEBUG statements
This commit is contained in:
Andrew Bettison 2013-11-21 17:32:58 +10:30
parent 702d22de99
commit 67a724b29d
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
commandline.c
View File

@ -1117,7 +1117,7 @@ int app_trace(const struct cli_parsed *parsed, struct cli_context *context)
int ret=overlay_mdp_send(mdp_sockfd, &mdp, MDP_AWAITREPLY, 5000); int ret=overlay_mdp_send(mdp_sockfd, &mdp, MDP_AWAITREPLY, 5000);
ob_free(b); ob_free(b);
if (ret) if (ret)
DEBUGF("overlay_mdp_send returned %d", ret); WHYF("overlay_mdp_send returned %d", ret);
else{ else{
int offset=0; int offset=0;
{ {
@ -2319,7 +2319,6 @@ int app_id_list(const struct cli_parsed *parsed, struct cli_context *context)
struct mdp_header rev_header; struct mdp_header rev_header;
unsigned char response_payload[1600]; unsigned char response_payload[1600];
ssize_t len = mdp_poll_recv(mdp_sock, timeout, &rev_header, response_payload, sizeof(response_payload)); ssize_t len = mdp_poll_recv(mdp_sock, timeout, &rev_header, response_payload, sizeof(response_payload));
DEBUGF("mdp_poll_recv = %zd", len);
if (len==-1) if (len==-1)
break; break;
if (len==-2){ if (len==-2){
@ -2838,11 +2837,10 @@ int app_network_scan(const struct cli_parsed *parsed, struct cli_context *contex
return -1; return -1;
if (address){ if (address){
DEBUGF("Parsing arg %s", address);
if (!inet_aton(address, &scan->addr)) if (!inet_aton(address, &scan->addr))
return WHY("Unable to parse the address"); return WHY("Unable to parse the address");
}else }else
DEBUGF("Scanning local networks"); INFO("Scanning local networks");
if ((mdp_sockfd = overlay_mdp_client_socket()) < 0) if ((mdp_sockfd = overlay_mdp_client_socket()) < 0)
return WHY("Cannot create MDP socket"); return WHY("Cannot create MDP socket");

16
meshms.c
View File

@ -274,8 +274,12 @@ static int ply_read_next(struct ply_read *ply)
return 1; return 1;
} }
ply->read.offset -= sizeof footer; ply->read.offset -= sizeof footer;
if (rhizome_read_buffered(&ply->read, &ply->buff, footer, sizeof footer) != sizeof footer) ssize_t read;
return -1; read = rhizome_read_buffered(&ply->read, &ply->buff, footer, sizeof footer);
if (read == -1)
return WHYF("rhizome_read_buffered() failed");
if ((size_t) read != sizeof footer)
return WHYF("Expected %zu bytes read, got %zu", (size_t) sizeof footer, (size_t) read);
// (rhizome_read automatically advances the offset by the number of bytes read) // (rhizome_read automatically advances the offset by the number of bytes read)
ply->record_length=read_uint16(footer); ply->record_length=read_uint16(footer);
ply->type = ply->record_length & 0xF; ply->type = ply->record_length & 0xF;
@ -302,9 +306,11 @@ static int ply_read_next(struct ply_read *ply)
ply->buffer = b; ply->buffer = b;
} }
ssize_t read = rhizome_read_buffered(&ply->read, &ply->buff, ply->buffer, ply->record_length); read = rhizome_read_buffered(&ply->read, &ply->buff, ply->buffer, ply->record_length);
if (read != ply->record_length) if (read == -1)
return WHYF("Expected %u bytes read, got %zd", ply->record_length, read); return WHYF("rhizome_read_buffered() failed");
if ((size_t) read != ply->record_length)
return WHYF("Expected %u bytes read, got %zu", ply->record_length, (size_t) read);
ply->read.offset = record_start; ply->read.offset = record_start;
return 0; return 0;

5
rhizome_store.c
View File

@ -838,7 +838,7 @@ ssize_t rhizome_read_buffered(struct rhizome_read *read, struct rhizome_read_buf
size_t bytes_copied=0; size_t bytes_copied=0;
while (len>0){ while (len>0){
DEBUGF("len=%zu read->length=%"PRIu64" read->offset=%"PRIu64" buffer->offset=%"PRIu64"", len, read->length, read->offset, buffer->offset); //DEBUGF("len=%zu read->length=%"PRIu64" read->offset=%"PRIu64" buffer->offset=%"PRIu64"", len, read->length, read->offset, buffer->offset);
// make sure we only attempt to read data that actually exists // make sure we only attempt to read data that actually exists
if (read->length != RHIZOME_SIZE_UNSET && read->offset + len > read->length) if (read->length != RHIZOME_SIZE_UNSET && read->offset + len > read->length)
len = read->length - read->offset; len = read->length - read->offset;
@ -858,7 +858,6 @@ ssize_t rhizome_read_buffered(struct rhizome_read *read, struct rhizome_read_buf
len-=size; len-=size;
read->offset+=size; read->offset+=size;
bytes_copied+=size; bytes_copied+=size;
DEBUGF("read->offset=%"PRIu64, read->offset);
continue; continue;
} }
} }
@ -876,7 +875,6 @@ ssize_t rhizome_read_buffered(struct rhizome_read *read, struct rhizome_read_buf
bcopy(buffer->data + ofs - size, data + len - size, size); bcopy(buffer->data + ofs - size, data + len - size, size);
len-=size; len-=size;
bytes_copied+=size; bytes_copied+=size;
DEBUGF("read->offset=%"PRIu64, read->offset);
continue; continue;
} }
} }
@ -892,7 +890,6 @@ ssize_t rhizome_read_buffered(struct rhizome_read *read, struct rhizome_read_buf
if (r == -1) if (r == -1)
return -1; return -1;
buffer->len = (size_t) r; buffer->len = (size_t) r;
DEBUGF("read->offset=%"PRIu64, read->offset);
} }
return bytes_copied; return bytes_copied;
} }