Skip to content

Commit eadb49f

Browse files
tricktuxtricktux
committed
chore: formatting
1 parent a869b5d commit eadb49f

File tree

7 files changed

+65
-45
lines changed

7 files changed

+65
-45
lines changed

‎source/prime-time/is-prime-request.c

+36-20
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,19 @@ int is_prime_request_builder(struct is_prime_request** request,
3737
bool prime;
3838
int j = 1, number;
3939
char *str1 = raw_request, *token, *saveptr1;
40-
struct is_prime_request *prev;
40+
struct is_prime_request* prev;
4141

4242
// tokenizer on the split delimiters
43-
for (; ; j++, str1 = NULL) {
43+
for (;; j++, str1 = NULL) {
4444
token = strtok_r(str1, DELIMETERS, &saveptr1);
4545
if (token == NULL)
4646
break;
4747
number = is_prime_request_malformed(token);
4848
prime = is_prime(number);
4949

50-
// The very first request pointer should be the one passed
50+
// The very first request pointer should be the one passed
5151
// as argument to the function
52-
struct is_prime_request *curr;
52+
struct is_prime_request* curr;
5353
is_prime_init(&curr, number, prime);
5454
if (j == 1)
5555
*request = curr;
@@ -82,70 +82,83 @@ void is_prime_init(struct is_prime_request** request, int number, bool prime)
8282
(*request)->number = number;
8383
}
8484

85-
int is_prime_request_malformed(char *req)
85+
int is_prime_request_malformed(char* req)
8686
{
8787
assert(req != NULL);
8888

8989
log_trace("is_prime_request_malformed: parsing request: '%s'", req);
9090

9191
{
9292
// If there's a period it probably means a double and that's is a non-prime
93-
char *r = NULL;
93+
char* r = NULL;
9494
r = strchr(req, '.');
9595
if (r != NULL)
9696
return -8;
9797
}
9898

9999
// Is json?
100-
json_object *root = json_tokener_parse(req);
100+
json_object* root = json_tokener_parse(req);
101101
if (!root) {
102102
log_warn("is_prime_request_malformed: json_tokener_parse failed");
103103
return -1;
104104
}
105105

106-
json_object *method = json_object_object_get(root, PRIME_RESPONSE_METHOD_KEY);
106+
json_object* method = json_object_object_get(root, PRIME_RESPONSE_METHOD_KEY);
107107
if (!method) {
108108
json_object_put(root);
109-
log_warn("is_prime_request_malformed: json_object_object_get failed for 'method'");
109+
log_warn(
110+
"is_prime_request_malformed: json_object_object_get failed for "
111+
"'method'");
110112
return -2;
111113
}
112114

113-
const char *method_value = json_object_get_string(method);
115+
const char* method_value = json_object_get_string(method);
114116
if (!method_value) {
115117
json_object_put(root);
116-
log_warn("is_prime_request_malformed: json_object_get_string failed for 'method'");
118+
log_warn(
119+
"is_prime_request_malformed: json_object_get_string failed for "
120+
"'method'");
117121
return -3;
118122
}
119123

120-
if (strncmp(PRIME_RESPONSE_METHOD_VALUE, method_value, PRIME_RESPONSE_METHOD_VALUE_LEN) != 0) {
124+
if (strncmp(PRIME_RESPONSE_METHOD_VALUE,
125+
method_value,
126+
PRIME_RESPONSE_METHOD_VALUE_LEN)
127+
!= 0)
128+
{
121129
json_object_put(root);
122-
log_warn("is_prime_request_malformed: method value did not match '%s'", method_value);
130+
log_warn("is_prime_request_malformed: method value did not match '%s'",
131+
method_value);
123132
return -4;
124133
}
125134

126-
json_object *number = json_object_object_get(root, PRIME_REQUEST_NUMBER_KEY);
135+
json_object* number = json_object_object_get(root, PRIME_REQUEST_NUMBER_KEY);
127136
if (!method) {
128137
json_object_put(root);
129-
log_warn("is_prime_request_malformed: json_object_object_get failed for 'number'");
138+
log_warn(
139+
"is_prime_request_malformed: json_object_object_get failed for "
140+
"'number'");
130141
return -5;
131142
}
132143

133144
errno = 0;
134145
int number_value = json_object_get_int(number);
135146
if (errno != 0) {
136147
json_object_put(root);
137-
log_warn("is_prime_request_malformed: json_object_get_int64 failed for '%s'", number);
148+
log_warn(
149+
"is_prime_request_malformed: json_object_get_int64 failed for '%s'",
150+
number);
138151
return -7;
139152
}
140153

141154
json_object_put(root);
142155
return number_value;
143156
}
144157

145-
bool is_prime(int number)
158+
bool is_prime(int number)
146159
{
147160
if (number <= 1)
148-
return false; // less than 2 are not prime numbers
161+
return false; // less than 2 are not prime numbers
149162
for (int i = 2; i * i <= number; i++) {
150163
if (number % i == 0)
151164
return false;
@@ -158,10 +171,13 @@ void is_prime_beget_response(struct is_prime_request* request)
158171
assert(request != NULL);
159172

160173
if (request->number < 0) {
161-
sprintf(request->response, PRIME_RESPONSE_FORMAT, "\"ill-formed-request!!!\"");
174+
sprintf(
175+
request->response, PRIME_RESPONSE_FORMAT, "\"ill-formed-request!!!\"");
162176
return;
163177
}
164-
sprintf(request->response, PRIME_RESPONSE_FORMAT, (request->is_prime ? "true" : "false"));
178+
sprintf(request->response,
179+
PRIME_RESPONSE_FORMAT,
180+
(request->is_prime ? "true" : "false"));
165181
}
166182

167183
void is_prime_free(struct is_prime_request** request)

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

+2-4
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
#define PRIME_RESPONSE_METHOD_VALUE "isPrime"
1111
#define PRIME_RESPONSE_METHOD_VALUE_LEN 7
1212
#define PRIME_RESPONSE_NUMBER_KEY "prime"
13-
#define PRIME_RESPONSE_FORMAT \
14-
"{\"method\":\"isPrime\",\"prime\":%s}\n"
13+
#define PRIME_RESPONSE_FORMAT "{\"method\":\"isPrime\",\"prime\":%s}\n"
1514

1615
#ifdef __cplusplus
1716
extern "C" {
@@ -27,13 +26,12 @@ struct is_prime_request {
2726
int is_prime_request_builder(struct is_prime_request** request,
2827
char* raw_request,
2928
size_t req_size);
30-
int is_prime_request_malformed(char *req);
29+
int is_prime_request_malformed(char* req);
3130
bool is_prime(int number);
3231
void is_prime_beget_response(struct is_prime_request* request);
3332
void is_prime_init(struct is_prime_request** request, int number, bool prime);
3433
void is_prime_free(struct is_prime_request** request);
3534

36-
3735
#ifdef __cplusplus
3836
}
3937
#endif

‎source/prime-time/main.c

+6-3
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ void handle_request(int fd, char* raw_req, size_t size)
5151

5252
int l = 0, sl = 0, res = 0;
5353
for (it = req; it != NULL; it = it->next) {
54-
l = (int) strlen(it->response);
54+
l = (int)strlen(it->response);
5555
sl = l;
5656
res = sendall(fd, it->response, &l);
5757
if (res != 0) {
@@ -151,8 +151,11 @@ int main()
151151

152152
// Handle there's data to process
153153
if (size > 0) {
154-
log_trace("main epoll loop: handling prime request of size '%d' on fd '%d'", size, fd);
155-
handle_request(fd, data, (size_t) size);
154+
log_trace(
155+
"main epoll loop: handling prime request of size '%d' on fd '%d'",
156+
size,
157+
fd);
158+
handle_request(fd, data, (size_t)size);
156159
}
157160

158161
// Handle socket still open

‎source/utils/queue.h

-1
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,3 @@ int queue_pop_no_copy(struct queue* qu, char** data);
2626
#endif
2727

2828
#endif // INCLUDE_UTILS_QUEUE_H_
29-

‎source/utils/sockets.h

-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@ int sendall(int sfd, char* buf, int* len);
66
int create_server(const char* port, int* listen_fd);
77

88
#endif // INCLUDE_UTILS_SOCKETS_H_
9-

‎source/utils/utils.h

-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@ int init_logs(FILE* fd, int log_level);
66
int recv_request(int fd, struct queue* qu);
77

88
#endif // INCLUDE_UTILS_UTILS_H_
9-

‎test/is-prime/is-prime-request-test.cpp

+21-15
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323

2424
#define PRIME_TRUE "{\"method\":\"isPrime\",\"prime\":true}\n"
2525
#define PRIME_FALSE "{\"method\":\"isPrime\",\"prime\":false}\n"
26-
#define PRIME_MALFORMED "{\"method\":\"isPrime\",\"prime\":\"ill-formed-request!!!\"}\n"
26+
#define PRIME_MALFORMED \
27+
"{\"method\":\"isPrime\",\"prime\":\"ill-formed-request!!!\"}\n"
2728

2829
TEST_CASE("is_prime_request_builder handles valid requests", "[request]")
2930
{
@@ -56,27 +57,30 @@ TEST_CASE("is_prime_request_builder handles valid requests", "[request]")
5657
SECTION("Valid request with floating-point number")
5758
{
5859
char raw_request[] = "{\"method\":\"isPrime\",\"number\":17.5}\n";
59-
REQUIRE(
60-
is_prime_request_builder(&request, raw_request, strlen(raw_request))
61-
== 1);
60+
REQUIRE(is_prime_request_builder(&request, raw_request, strlen(raw_request))
61+
== 1);
6262
REQUIRE(request != NULL);
6363
REQUIRE(request->number < 0);
6464
REQUIRE(request->is_prime == false);
6565
REQUIRE(request->next == NULL);
6666
REQUIRE(strcmp(request->response, PRIME_MALFORMED) == 0);
6767
}
6868

69-
SECTION("Valid composite request with prime number; followed by non prime request")
69+
SECTION(
70+
"Valid composite request with prime number; followed by non prime "
71+
"request")
7072
{
71-
char raw_request[] = "{\"method\":\"isPrime\",\"number\":17}\n{\"method\":\"isPrime\",\"number\":24}\n";
73+
char raw_request[] =
74+
"{\"method\":\"isPrime\",\"number\":17}\n{\"method\":\"isPrime\","
75+
"\"number\":24}\n";
7276
REQUIRE(is_prime_request_builder(&request, raw_request, strlen(raw_request))
7377
== 2);
7478
REQUIRE(request != NULL);
7579
REQUIRE(request->number == 17);
7680
REQUIRE(request->is_prime == true);
7781
REQUIRE(request->next != NULL);
7882
REQUIRE(strcmp(request->response, PRIME_TRUE) == 0);
79-
struct is_prime_request *next = request->next;
83+
struct is_prime_request* next = request->next;
8084
REQUIRE(next->number == 24);
8185
REQUIRE(next->is_prime == false);
8286
REQUIRE(next->next == NULL);
@@ -103,14 +107,16 @@ TEST_CASE("is_prime_request_builder handles invalid requests", "[request]")
103107
REQUIRE(strcmp(request->response, PRIME_MALFORMED) == 0);
104108
}
105109

106-
SECTION("Invalid composite request with prime number; followed by non prime request")
110+
SECTION(
111+
"Invalid composite request with prime number; followed by non prime "
112+
"request")
107113
{
108-
char raw_request[] =
109-
"{\"method\":\"isPrime\",\"number\":17}\n"
110-
"{\"method\":\"isPrime\",\"number\":24}\n"
111-
"{\"method\":\"isPrime\",\"number\":13}\n"
112-
"{\"method\":\"isPrime\",\"number\":\"hola\"}\n"
113-
"{\"method\":\"isPrime\",\"number\":23}\n";
114+
char raw_request[] =
115+
"{\"method\":\"isPrime\",\"number\":17}\n"
116+
"{\"method\":\"isPrime\",\"number\":24}\n"
117+
"{\"method\":\"isPrime\",\"number\":13}\n"
118+
"{\"method\":\"isPrime\",\"number\":\"hola\"}\n"
119+
"{\"method\":\"isPrime\",\"number\":23}\n";
114120
REQUIRE(is_prime_request_builder(&request, raw_request, strlen(raw_request))
115121
== 4);
116122
REQUIRE(request != NULL);
@@ -119,7 +125,7 @@ TEST_CASE("is_prime_request_builder handles invalid requests", "[request]")
119125
REQUIRE(request->next != NULL);
120126
REQUIRE(strcmp(request->response, PRIME_TRUE) == 0);
121127

122-
struct is_prime_request *next = request->next;
128+
struct is_prime_request* next = request->next;
123129
REQUIRE(next->number == 24);
124130
REQUIRE(next->is_prime == false);
125131
REQUIRE(next->next != NULL);

0 commit comments

Comments
 (0)