Skip to content

Commit 64a87bf

Browse files
dosshelldosshell
committed
Use size and length naming
1 parent 6e0907a commit 64a87bf

10 files changed

Lines changed: 538 additions & 538 deletions

File tree

‎examples/tcp_client.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ int main(void)
5050

5151
uint8_t recv_buffer[1024];
5252
size_t recv_size = sizeof(recv_buffer) - 1;
53-
size_t bytes_received = 0;
54-
if (tcs_receive(client_socket, recv_buffer, recv_size, TCS_FLAG_NONE, &bytes_received) != TCS_SUCCESS)
53+
size_t received_size = 0;
54+
if (tcs_receive(client_socket, recv_buffer, recv_size, TCS_FLAG_NONE, &received_size) != TCS_SUCCESS)
5555
return show_error("Could not receive data");
5656

5757
// Makes sure it is a NULL terminated string, this is why we only accept 1023 bytes in receive
58-
recv_buffer[bytes_received] = '\0';
58+
recv_buffer[received_size] = '\0';
5959
printf("received: %s\n", recv_buffer);
6060

6161
if (tcs_shutdown(client_socket, TCS_SHUTDOWN_BOTH) != TCS_SUCCESS)

‎examples/tcp_server.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ int main(void)
5454

5555
uint8_t recv_buffer[1024];
5656
size_t recv_size = sizeof(recv_buffer) - 1;
57-
size_t bytes_received = 0;
58-
if (tcs_receive(child_socket, recv_buffer, recv_size, TCS_FLAG_NONE, &bytes_received) != TCS_SUCCESS)
57+
size_t received_size = 0;
58+
if (tcs_receive(child_socket, recv_buffer, recv_size, TCS_FLAG_NONE, &received_size) != TCS_SUCCESS)
5959
return show_error("Could not receive data from client");
6060

61-
recv_buffer[bytes_received] = '\0';
61+
recv_buffer[received_size] = '\0';
6262
printf("received: %s\n", recv_buffer);
6363

6464
char msg[] = "I hear you loud and clear\n";

‎examples/udp_client.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ int main(void)
4747

4848
uint8_t recv_buffer[1024];
4949
size_t recv_size = sizeof(recv_buffer) - 1;
50-
size_t bytes_received = 0;
51-
if (tcs_receive(socket, recv_buffer, recv_size, TCS_FLAG_NONE, &bytes_received) != TCS_SUCCESS)
50+
size_t received_size = 0;
51+
if (tcs_receive(socket, recv_buffer, recv_size, TCS_FLAG_NONE, &received_size) != TCS_SUCCESS)
5252
return show_error("Could not receive data");
5353

5454
// Makes sure it is a NULL terminated string, this is why we only accept 1023 bytes in receive
55-
recv_buffer[bytes_received] = '\0';
55+
recv_buffer[received_size] = '\0';
5656
printf("received: %s\n", recv_buffer);
5757

5858
if (tcs_close(&socket) != TCS_SUCCESS)

‎examples/udp_server.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ int main(void)
4444
struct TcsAddress remote_address = {0};
4545
uint8_t recv_buffer[1024];
4646
size_t recv_size = sizeof(recv_buffer) - 1;
47-
size_t bytes_received = 0;
48-
if (tcs_receive_from(socket, recv_buffer, recv_size, TCS_FLAG_NONE, &remote_address, &bytes_received) !=
47+
size_t received_size = 0;
48+
if (tcs_receive_from(socket, recv_buffer, recv_size, TCS_FLAG_NONE, &remote_address, &received_size) !=
4949
TCS_SUCCESS)
5050
return show_error("Could not receive data");
5151

5252
// Makes sure it is a NULL terminated string, this is why we only accept 1023 bytes in receive
53-
recv_buffer[bytes_received] = '\0';
53+
recv_buffer[received_size] = '\0';
5454
printf("received: %s\n", recv_buffer);
5555

5656
char msg[] = "I hear you loud and clear\n";

‎include/tinycsocket.h‎

Lines changed: 247 additions & 247 deletions
Large diffs are not rendered by default.

‎src/tinycsocket_common.c‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -176,15 +176,15 @@ TcsResult tcs_socket_tcp(TcsSocket* out_socket,
176176
return res;
177177
}
178178
struct TcsPollEvent event = TCS_POLL_EVENT_EMPTY;
179-
size_t events_populated = 0;
180-
res = tcs_poll_wait(poll, &event, 1, &events_populated, timeout_ms);
179+
size_t out_events_length = 0;
180+
res = tcs_poll_wait(poll, &event, 1, &out_events_length, timeout_ms);
181181
tcs_poll_destroy(&poll);
182182
if (res == TCS_ERROR_TIMED_OUT)
183183
{
184184
tcs_close(out_socket);
185185
return TCS_ERROR_TIMED_OUT;
186186
}
187-
if (res != TCS_SUCCESS || events_populated == 0)
187+
if (res != TCS_SUCCESS || out_events_length == 0)
188188
{
189189
tcs_close(out_socket);
190190
return res != TCS_SUCCESS ? res : TCS_ERROR_UNKNOWN;
@@ -499,17 +499,17 @@ TcsResult tcs_connect_str(TcsSocket socket, const char* remote_address, uint16_t
499499
// tcs_send_to() is defined in OS specific files
500500
// tcs_sendv() is defined in OS specific files
501501

502-
TcsResult tcs_send_netstring(TcsSocket socket, const uint8_t* buffer, size_t buffer_length)
502+
TcsResult tcs_send_netstring(TcsSocket socket, const uint8_t* buffer, size_t buffer_size)
503503
{
504504
if (socket == TCS_SOCKET_INVALID)
505505
return TCS_ERROR_INVALID_ARGUMENT;
506506

507-
if (buffer == NULL || buffer_length == 0)
507+
if (buffer == NULL || buffer_size == 0)
508508
return TCS_ERROR_INVALID_ARGUMENT;
509509

510510
#if SIZE_MAX > 0xffffffffffffffffULL
511-
// buffer_length bigger than 64 bits? (size_t can be bigger on some systems)
512-
if (buffer_length > 0xffffffffffffffffULL)
511+
// buffer_size bigger than 64 bits? (size_t can be bigger on some systems)
512+
if (buffer_size > 0xffffffffffffffffULL)
513513
return TCS_ERROR_INVALID_ARGUMENT;
514514
#endif
515515

@@ -518,7 +518,7 @@ TcsResult tcs_send_netstring(TcsSocket socket, const uint8_t* buffer, size_t buf
518518
memset(netstring_header, 0, sizeof netstring_header);
519519

520520
// %zu is not supported by all compilers, therefor we cast it to llu
521-
header_length = snprintf(netstring_header, 21, "%llu:", (unsigned long long)buffer_length);
521+
header_length = snprintf(netstring_header, 21, "%llu:", (unsigned long long)buffer_size);
522522

523523
if (header_length < 0)
524524
return TCS_ERROR_INVALID_ARGUMENT;
@@ -528,7 +528,7 @@ TcsResult tcs_send_netstring(TcsSocket socket, const uint8_t* buffer, size_t buf
528528
if (sts != TCS_SUCCESS)
529529
return sts;
530530

531-
sts = tcs_send(socket, buffer, buffer_length, TCS_MSG_SENDALL, NULL);
531+
sts = tcs_send(socket, buffer, buffer_size, TCS_MSG_SENDALL, NULL);
532532
if (sts != TCS_SUCCESS)
533533
return sts;
534534

@@ -544,18 +544,18 @@ TcsResult tcs_send_netstring(TcsSocket socket, const uint8_t* buffer, size_t buf
544544

545545
TcsResult tcs_receive_line(TcsSocket socket,
546546
uint8_t* buffer,
547-
size_t buffer_length,
547+
size_t buffer_size,
548548
uint8_t delimiter,
549-
size_t* out_bytes_received)
549+
size_t* out_received_size)
550550
{
551-
if (socket == TCS_SOCKET_INVALID || buffer == NULL || buffer_length == 0)
551+
if (socket == TCS_SOCKET_INVALID || buffer == NULL || buffer_size == 0)
552552
return TCS_ERROR_INVALID_ARGUMENT;
553553

554554
/*
555555
* data in kernel buffer
556556
* |12345yyyyyyyyyyyyyyyyyyyyyyyy..............|
557557
*
558-
* buffer_length ----------------------------------.
558+
* buffer_size ----------------------------------.
559559
* searched ----------------------. |
560560
* | |
561561
* bytes_peeked ------------------. |
@@ -567,16 +567,16 @@ TcsResult tcs_receive_line(TcsSocket socket,
567567
size_t bytes_read = 0;
568568
size_t bytes_peeked = 0;
569569
size_t bytes_searched = 0;
570-
while (bytes_read < buffer_length)
570+
while (bytes_read < buffer_size)
571571
{
572572
TcsResult sts = TCS_SUCCESS;
573-
size_t bytes_free_in_buffer = buffer_length - bytes_read;
573+
size_t bytes_free_in_buffer = buffer_size - bytes_read;
574574
size_t current_peeked = 0;
575575
sts = tcs_receive(socket, buffer + bytes_read, bytes_free_in_buffer, TCS_MSG_PEEK, &current_peeked);
576576
if (sts != TCS_SUCCESS)
577577
{
578-
if (out_bytes_received != NULL)
579-
*out_bytes_received = bytes_read;
578+
if (out_received_size != NULL)
579+
*out_received_size = bytes_read;
580580
return sts;
581581
}
582582
bytes_peeked += current_peeked;
@@ -592,8 +592,8 @@ TcsResult tcs_receive_line(TcsSocket socket,
592592

593593
if (sts != TCS_SUCCESS)
594594
{
595-
if (out_bytes_received != NULL)
596-
*out_bytes_received = bytes_read;
595+
if (out_received_size != NULL)
596+
*out_received_size = bytes_read;
597597
return sts;
598598
}
599599
}
@@ -619,26 +619,26 @@ TcsResult tcs_receive_line(TcsSocket socket,
619619
bytes_read += bytes;
620620
if (sts != TCS_SUCCESS)
621621
{
622-
if (out_bytes_received != NULL)
623-
*out_bytes_received = bytes_read;
622+
if (out_received_size != NULL)
623+
*out_received_size = bytes_read;
624624
return sts;
625625
}
626626
}
627627
if (found_delimiter)
628628
{
629-
if (out_bytes_received != NULL)
630-
*out_bytes_received = bytes_read;
629+
if (out_received_size != NULL)
630+
*out_received_size = bytes_read;
631631
return sts;
632632
}
633633
}
634-
if (out_bytes_received != NULL)
635-
*out_bytes_received = bytes_read;
634+
if (out_received_size != NULL)
635+
*out_received_size = bytes_read;
636636
return TCS_AGAIN;
637637
}
638638

639-
TcsResult tcs_receive_netstring(TcsSocket socket, uint8_t* buffer, size_t buffer_length, size_t* out_bytes_received)
639+
TcsResult tcs_receive_netstring(TcsSocket socket, uint8_t* buffer, size_t buffer_size, size_t* out_received_size)
640640
{
641-
if (socket == TCS_SOCKET_INVALID || buffer == NULL || buffer_length == 0)
641+
if (socket == TCS_SOCKET_INVALID || buffer == NULL || buffer_size == 0)
642642
return TCS_ERROR_INVALID_ARGUMENT;
643643

644644
size_t expected_length = 0;
@@ -671,7 +671,7 @@ TcsResult tcs_receive_netstring(TcsSocket socket, uint8_t* buffer, size_t buffer
671671
if (parsed >= max_header)
672672
return TCS_ERROR_ILL_FORMED_MESSAGE;
673673

674-
if (buffer_length < expected_length)
674+
if (buffer_size < expected_length)
675675
return TCS_ERROR_MEMORY;
676676

677677
sts = tcs_receive(socket, buffer, expected_length, TCS_MSG_WAITALL, NULL);
@@ -685,8 +685,8 @@ TcsResult tcs_receive_netstring(TcsSocket socket, uint8_t* buffer, size_t buffer
685685
if (t != ',')
686686
return TCS_ERROR_ILL_FORMED_MESSAGE;
687687

688-
if (out_bytes_received != NULL)
689-
*out_bytes_received = expected_length;
688+
if (out_received_size != NULL)
689+
*out_received_size = expected_length;
690690

691691
return TCS_SUCCESS;
692692
}

0 commit comments

Comments
 (0)