fix: const-correct protocol send functions, remove duplicate typedef, null check
CI / lint (push) Failing after 6s
CI / build-and-test (push) Has been skipped
CI / sanitizers (address) (push) Has been skipped
CI / lint (pull_request) Failing after 5s
CI / build-and-test (pull_request) Has been skipped
CI / sanitizers (address) (pull_request) Has been skipped
CI / lint (push) Failing after 6s
CI / build-and-test (push) Has been skipped
CI / sanitizers (address) (push) Has been skipped
CI / lint (pull_request) Failing after 5s
CI / build-and-test (pull_request) Has been skipped
CI / sanitizers (address) (pull_request) Has been skipped
- send_n_data: void* data → const void* data - send_str: char* data → const char* data - send_data: Data* data → const Data* data - Remove duplicate typedef struct ssl_st SSL in protocol.h - Add NULL check after malloc in directory_scanner_create
This commit is contained in:
@@ -17,6 +17,8 @@ DirectoryScanner* directory_scanner_create(char* root_directory, bool use_metada
|
|||||||
int include_count, unsigned long long max_size,
|
int include_count, unsigned long long max_size,
|
||||||
unsigned long long min_size) {
|
unsigned long long min_size) {
|
||||||
DirectoryScanner* scanner = malloc(sizeof(DirectoryScanner));
|
DirectoryScanner* scanner = malloc(sizeof(DirectoryScanner));
|
||||||
|
if (scanner == NULL)
|
||||||
|
return NULL;
|
||||||
scanner->directories = queue_create(100, free);
|
scanner->directories = queue_create(100, free);
|
||||||
scanner->current_dir = NULL;
|
scanner->current_dir = NULL;
|
||||||
scanner->current_path = NULL;
|
scanner->current_path = NULL;
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ static int io_fd(int dir_fd, int file_descriptor) {
|
|||||||
return (dir_fd != -1) ? dir_fd : file_descriptor;
|
return (dir_fd != -1) ? dir_fd : file_descriptor;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool send_n_data(int file_descriptor, void* data, size_t data_size) {
|
bool send_n_data(int file_descriptor, const void* data, size_t data_size) {
|
||||||
log_message(LOG_LEVEL_DEBUG, " Sending n Data: %zu", data_size);
|
log_message(LOG_LEVEL_DEBUG, " Sending n Data: %zu", data_size);
|
||||||
int fd = io_fd(io_write_fd, file_descriptor);
|
int fd = io_fd(io_write_fd, file_descriptor);
|
||||||
ssize_t total_bytes_send = 0;
|
ssize_t total_bytes_send = 0;
|
||||||
@@ -75,9 +75,9 @@ bool send_n_data(int file_descriptor, void* data, size_t data_size) {
|
|||||||
chunk = 65536;
|
chunk = 65536;
|
||||||
ssize_t bytes_send;
|
ssize_t bytes_send;
|
||||||
if (io_ssl)
|
if (io_ssl)
|
||||||
bytes_send = SSL_write(io_ssl, (char*)data + total_bytes_send, chunk);
|
bytes_send = SSL_write(io_ssl, (const char*)data + total_bytes_send, chunk);
|
||||||
else
|
else
|
||||||
bytes_send = write(fd, (char*)data + total_bytes_send, chunk);
|
bytes_send = write(fd, (const char*)data + total_bytes_send, chunk);
|
||||||
if (bytes_send <= 0) {
|
if (bytes_send <= 0) {
|
||||||
log_message(LOG_LEVEL_ERROR, "Could not send data");
|
log_message(LOG_LEVEL_ERROR, "Could not send data");
|
||||||
return false;
|
return false;
|
||||||
@@ -133,7 +133,7 @@ static const char* status_to_string(Status status) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool send_str(int file_descriptor, char* data) {
|
bool send_str(int file_descriptor, const char* data) {
|
||||||
size_t size = strlen(data);
|
size_t size = strlen(data);
|
||||||
if (!send_n_data(file_descriptor, &size, sizeof(size_t)))
|
if (!send_n_data(file_descriptor, &size, sizeof(size_t)))
|
||||||
return false;
|
return false;
|
||||||
@@ -159,7 +159,7 @@ char* receive_str(int file_descriptor) {
|
|||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool send_data(int file_descriptor, Data* data) {
|
bool send_data(int file_descriptor, const Data* data) {
|
||||||
unsigned long long data_size = data->size;
|
unsigned long long data_size = data->size;
|
||||||
if (!send_n_data(file_descriptor, &data_size, sizeof(unsigned long long)))
|
if (!send_n_data(file_descriptor, &data_size, sizeof(unsigned long long)))
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -20,14 +20,13 @@ enum NET_STATUS {
|
|||||||
|
|
||||||
void io_set_fds(int read_fd, int write_fd);
|
void io_set_fds(int read_fd, int write_fd);
|
||||||
void io_set_bwlimit(unsigned long long bytes_per_sec);
|
void io_set_bwlimit(unsigned long long bytes_per_sec);
|
||||||
typedef struct ssl_st SSL;
|
|
||||||
void io_set_ssl(SSL* ssl);
|
void io_set_ssl(SSL* ssl);
|
||||||
bool send_n_data(int file_descriptor, void* data, size_t data_size);
|
bool send_n_data(int file_descriptor, const void* data, size_t data_size);
|
||||||
bool receive_n_data(int file_descriptor, void* data, size_t data_size);
|
bool receive_n_data(int file_descriptor, void* data, size_t data_size);
|
||||||
|
|
||||||
bool send_str(int file_descriptor, char* data);
|
bool send_str(int file_descriptor, const char* data);
|
||||||
char* receive_str(int file_descriptor);
|
char* receive_str(int file_descriptor);
|
||||||
bool send_data(int file_descriptor, Data* data);
|
bool send_data(int file_descriptor, const Data* data);
|
||||||
Data* receive_data(int file_descriptor);
|
Data* receive_data(int file_descriptor);
|
||||||
bool send_int(int file_descriptor, int data);
|
bool send_int(int file_descriptor, int data);
|
||||||
bool receive_int(int file_descriptor, int* data);
|
bool receive_int(int file_descriptor, int* data);
|
||||||
|
|||||||
Reference in New Issue
Block a user