Skip to content

Commit 2eb2183

Browse files
committed
fix: warning
1 parent 0d3c650 commit 2eb2183

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

source/means-to-an-end/asset-prices.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ void asset_prices_init_data(struct asset_prices* ps, size_t capacity)
1414
assert(capacity > ps->capacity);
1515

1616
struct asset_price* new_data = NULL;
17-
new_data = reallocarray(ps->data, sizeof(struct asset_price), capacity);
17+
new_data = reallocarray(ps->data, capacity, sizeof(struct asset_price));
1818
assert(new_data != NULL);
1919

2020
ps->data = new_data;

source/means-to-an-end/main.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ int main()
7272

7373
bool complete_req = false, client_found = false;
7474
char *data, *sddata;
75-
int n, fd, res, size, sdsize, rs, result;
75+
int n, fd, res, size, sdsize, rs;
7676
struct epoll_ctl_info epci = {epollfd, 0, 0};
77-
struct queue *rcqu = NULL, *sdqu = NULL;
77+
struct queue *sdqu = NULL;
7878
struct clients_session *ca = NULL;
7979
queue_init(&sdqu, QUEUE_CAPACITY);
8080

@@ -137,7 +137,7 @@ int main()
137137
fd,
138138
size);
139139

140-
message_parse(ca->asset, sdqu, data, size);
140+
message_parse(ca->asset, sdqu, data, (size_t) size);
141141
sdsize = queue_pop_no_copy(sdqu, &sddata);
142142
if (sdsize > 0) {
143143
rs = sendall(fd, sddata, &sdsize);

source/means-to-an-end/messages.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "means-to-an-end/asset-prices.h"
99
#include "means-to-an-end/messages.h"
1010

11-
void message_parse(struct asset_price *ps, struct queue* sdqu, char* data, size_t dsize)
11+
void message_parse(struct asset_prices *ps, struct queue* sdqu, char* data, size_t dsize)
1212
{
1313
assert(ps != NULL);
1414
assert(sdqu != NULL);

source/means-to-an-end/messages.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
#define MESSAGE_FIRST_WORD_OFFSET 1 // These are in network byte order
99
#define MESSAGE_SECOND_WORD_OFFSET 5 // These are in network byte order
1010

11-
void message_parse(struct asset_price *ps, struct queue* sdqu, char* data, size_t dsize);
11+
void message_parse(struct asset_prices *ps, struct queue* sdqu, char* data, size_t dsize);
1212

1313
#endif // INCLUDE_MESSAGES_H_

source/prime-time/is-prime-request.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#define PRIME_RESPONSE_NUMBER_KEY "prime"
1212
#define PRIME_RESPONSE_FORMAT "{\"method\":\"isPrime\",\"prime\":%s}\n"
1313
#define PRIME_RESPONSE_ILL_RESPONSE "{\"response to malformed request\"}\n"
14-
#define PRIME_RESPONSE_ILL_RESPONSE_SIZE 37
14+
#define PRIME_RESPONSE_ILL_RESPONSE_SIZE 34
1515

1616
#ifdef __cplusplus
1717
extern "C" {

source/utils/queue.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ void queue_expand_capacity(struct queue* qu, size_t size)
3535
if (size ==0)
3636
return;
3737

38-
if (qu->size + size < (qu->free_capacity * QUEUE_FREE_CAP_BUFFER))
38+
if (qu->size + size < ((size_t) ((double) qu->free_capacity * QUEUE_FREE_CAP_BUFFER)))
3939
return;
4040

4141
size_t new_cap = qu->capacity * 2, new_free_cap = new_cap - qu->size;
42-
while (qu->size + size >= (new_free_cap * QUEUE_FREE_CAP_BUFFER)) {
42+
while (qu->size + size >= (size_t) ((double) new_free_cap * QUEUE_FREE_CAP_BUFFER)) {
4343
new_cap *= 2;
4444
new_free_cap = new_cap - qu->size;
4545
}
@@ -115,7 +115,7 @@ void queue_push(struct queue* qu, char* data, size_t size)
115115
return;
116116
}
117117

118-
if (qu->size + size >= (qu->free_capacity * QUEUE_FREE_CAP_BUFFER)) {
118+
if (qu->size + size >= (size_t) ((double) qu->free_capacity * QUEUE_FREE_CAP_BUFFER)) {
119119
queue_expand_capacity(qu, size);
120120
log_info("queue_push: expanding current capacity to %d\n", qu->capacity);
121121
}
@@ -145,7 +145,7 @@ void queue_push_ex(struct queue* qu, size_t size)
145145
return;
146146
}
147147

148-
if (qu->size + size >= (qu->free_capacity * QUEUE_FREE_CAP_BUFFER)) {
148+
if (qu->size + size >= (size_t) ((double) qu->free_capacity * QUEUE_FREE_CAP_BUFFER)) {
149149
queue_expand_capacity(qu, size);
150150
log_info("queue_push: expanding current capacity to %d\n", qu->capacity);
151151
}

0 commit comments

Comments
 (0)