Merge pull request #137 from gwsystems/59-blacklist-thirdparty

chore: Ignore submodules when using clang-format
main
Sean McBride 4 years ago committed by GitHub
commit c0f80e6a73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -25,6 +25,6 @@ if ((major < required_major)) || ((minor < required_minor)) || ((patch < require
exit 1 exit 1
fi fi
find ./runtime -type f -path "./*.[ch]" | # Match all *.c and *.h files in ./runtime find ./runtime -type f -path "./*.[ch]" | # Match all *.c and *.h files in ./runtime
grep --invert-match -E "./runtime/jsmn/*|./runtime/http-parser/*" | # Excluding those in the jsmn or http-parser submodules grep --invert-match -E "./runtime/thirdparty/*|./runtime/tests/gocr/*|./runtime/tests/TinyEKF/*|./runtime/tests/CMSIS_5_NN/*|./runtime/tests/sod/*" | # Excluding those in the jsmn or http-parser submodules
xargs clang-format -i # And format them with clang-format xargs clang-format -i # And format them with clang-format

@ -2,9 +2,9 @@
#include "sandbox.h" #include "sandbox.h"
void current_sandbox_close_file_descriptor(int io_handle_index); void current_sandbox_close_file_descriptor(int io_handle_index);
struct sandbox * current_sandbox_get(void); struct sandbox *current_sandbox_get(void);
int current_sandbox_get_file_descriptor(int io_handle_index); int current_sandbox_get_file_descriptor(int io_handle_index);
int current_sandbox_initialize_io_handle(void); int current_sandbox_initialize_io_handle(void);
void current_sandbox_set(struct sandbox *sandbox); void current_sandbox_set(struct sandbox *sandbox);
int current_sandbox_set_file_descriptor(int io_handle_index, int file_descriptor); int current_sandbox_set_file_descriptor(int io_handle_index, int file_descriptor);

@ -42,8 +42,8 @@ send_fn(void *d)
{ {
struct request *r = (struct request *)d; struct request *r = (struct request *)d;
char resp[STR_MAX] = { 0 }; char resp[STR_MAX] = { 0 };
int file_descriptor = -1; int file_descriptor = -1;
struct sockaddr_in sa; struct sockaddr_in sa;
sa.sin_family = AF_INET; sa.sin_family = AF_INET;
@ -54,7 +54,8 @@ send_fn(void *d)
return NULL; return NULL;
} }
if (sendto(file_descriptor, r->msg, strlen(r->msg), 0, (struct sockaddr *)&sa, sizeof(sa)) < 0 && errno != EINTR) { if (sendto(file_descriptor, r->msg, strlen(r->msg), 0, (struct sockaddr *)&sa, sizeof(sa)) < 0
&& errno != EINTR) {
perror("sendto"); perror("sendto");
return NULL; return NULL;
} }

Loading…
Cancel
Save