From 8c15f4bf23dc8b8d74239e21cc93d7db4efe9a8a Mon Sep 17 00:00:00 2001 From: Gregor Jasny Date: Tue, 25 Oct 2022 18:28:46 +0200 Subject: [PATCH] Fix warnings (#1046) Clang emitted some easy to fix warnings. --- src/apps/common/apputils.c | 4 ++-- src/apps/relay/dbdrivers/dbdriver.c | 2 +- src/apps/relay/http_server.c | 2 +- src/apps/relay/libtelnet.c | 8 ++++---- src/apps/relay/userdb.c | 2 +- src/apps/uclient/uclient.c | 2 +- src/server/ns_turn_maps.c | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/apps/common/apputils.c b/src/apps/common/apputils.c index 3168a42..8877e8c 100644 --- a/src/apps/common/apputils.c +++ b/src/apps/common/apputils.c @@ -665,7 +665,7 @@ int get_socket_mtu(evutil_socket_t fd, int family, int verbose) //////////////////// socket error handle //////////////////// -int handle_socket_error() { +int handle_socket_error(void) { switch (errno) { case EINTR: /* Interrupted system call. @@ -969,7 +969,7 @@ char *base64_encode(const unsigned char *data, return encoded_data; } -void build_base64_decoding_table() { +void build_base64_decoding_table(void) { decoding_table = (char*)malloc(256); memset(decoding_table, 0, 256); diff --git a/src/apps/relay/dbdrivers/dbdriver.c b/src/apps/relay/dbdrivers/dbdriver.c index cc407f4..fe29a3a 100644 --- a/src/apps/relay/dbdrivers/dbdriver.c +++ b/src/apps/relay/dbdrivers/dbdriver.c @@ -67,7 +67,7 @@ persistent_users_db_t * get_persistent_users_db(void) { return &(turn_params.default_users_db.persistent_users_db); } -const turn_dbdriver_t * get_dbdriver() +const turn_dbdriver_t * get_dbdriver(void) { if (turn_params.default_users_db.userdb_type == TURN_USERDB_TYPE_UNKNOWN) return NULL; diff --git a/src/apps/relay/http_server.c b/src/apps/relay/http_server.c index 5e7d920..7590794 100644 --- a/src/apps/relay/http_server.c +++ b/src/apps/relay/http_server.c @@ -77,7 +77,7 @@ void handle_http_echo(ioa_socket_handle s) { write_http_echo(s); } -const char* get_http_date_header() +const char* get_http_date_header(void) { static char buffer_date[256]; static char buffer_header[1025]; diff --git a/src/apps/relay/libtelnet.c b/src/apps/relay/libtelnet.c index b28410f..d765eae 100644 --- a/src/apps/relay/libtelnet.c +++ b/src/apps/relay/libtelnet.c @@ -744,7 +744,7 @@ static int _mssp_telnet(telnet_t *telnet, char* buffer, size_t size) { /* parse ZMP command subnegotiation buffers */ static int _zmp_telnet(telnet_t *telnet, const char* buffer, size_t size) { telnet_event_t ev; - char **argv; + const char **argv; const char *c; size_t i, argc; @@ -760,7 +760,7 @@ static int _zmp_telnet(telnet_t *telnet, const char* buffer, size_t size) { c += strlen(c) + 1; /* allocate argument array, bail on error */ - if ((argv = (char **)calloc(argc, sizeof(char *))) == 0) { + if ((argv = (const char **)calloc(argc, sizeof(const char *))) == 0) { _error(telnet, __LINE__, __func__, TELNET_ENOMEM, 0, "calloc() failed: %s", strerror(errno)); return 0; @@ -768,13 +768,13 @@ static int _zmp_telnet(telnet_t *telnet, const char* buffer, size_t size) { /* populate argument array */ for (i = 0, c = buffer; i != argc; ++i) { - argv[i] = (char *)c; + argv[i] = c; c += strlen(c) + 1; } /* invoke event with our arguments */ ev.type = TELNET_EV_ZMP; - ev.zmp.argv = (const char**)argv; + ev.zmp.argv = argv; ev.zmp.argc = argc; telnet->eh(telnet, &ev, telnet->ud); diff --git a/src/apps/relay/userdb.c b/src/apps/relay/userdb.c index e8b7602..9c8f79d 100644 --- a/src/apps/relay/userdb.c +++ b/src/apps/relay/userdb.c @@ -73,7 +73,7 @@ void update_o_to_realm(ur_string_map * o_to_realm_new) { TURN_MUTEX_UNLOCK(&o_to_realm_mutex); } -void create_default_realm() +void create_default_realm(void) { if(default_realm_params_ptr) { return; diff --git a/src/apps/uclient/uclient.c b/src/apps/uclient/uclient.c index 75c22a9..9d5f86e 100644 --- a/src/apps/uclient/uclient.c +++ b/src/apps/uclient/uclient.c @@ -1699,7 +1699,7 @@ int check_integrity(app_ur_conn_info *clnet_info, stun_buffer *message) return 0; } -SOCKET_TYPE get_socket_type() +SOCKET_TYPE get_socket_type(void) { if(use_sctp) { if(use_secure) { diff --git a/src/server/ns_turn_maps.c b/src/server/ns_turn_maps.c index b991cf2..fb316ea 100644 --- a/src/server/ns_turn_maps.c +++ b/src/server/ns_turn_maps.c @@ -58,7 +58,7 @@ static int ur_map_init(ur_map* map) { #define ur_map_valid(map) ((map) && ((map)->h) && ((map)->magic==MAGIC_HASH)) -ur_map* ur_map_create() { +ur_map* ur_map_create(void) { ur_map *map=(ur_map*)malloc(sizeof(ur_map)); if(ur_map_init(map)<0) { free(map);