From fdefb03790230a0ae3852ccefc5d363a495b0d26 Mon Sep 17 00:00:00 2001
From: Roman Khlopkov <roman.khlopkov@demlabs.net>
Date: Tue, 2 Jul 2024 16:30:05 +0300
Subject: [PATCH] [*] Cosmetic changes
---
net/client/dap_client.c | 11 +++--------
net/client/include/dap_client.h | 1 -
net/server/http_server/dap_http_simple.c | 2 +-
3 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/net/client/dap_client.c b/net/client/dap_client.c
index ce48c0c51..92589f856 100644
--- a/net/client/dap_client.c
+++ b/net/client/dap_client.c
@@ -196,15 +196,10 @@ void dap_client_queue_clear(dap_client_t *a_client)
*/
void dap_client_set_auth_cert(dap_client_t *a_client, const char *a_cert_name)
{
- static dap_cert_t *l_cert = NULL;
-
- if (a_client == NULL || a_cert_name == NULL) {
- log_it(L_ERROR,"Client or cert-name is NULL for dap_client_set_auth_cert");
- return;
- }
- l_cert = dap_cert_find_by_name(a_cert_name);
+ dap_return_if_fail(a_client && a_cert_name);
+ dap_cert_t *l_cert = dap_cert_find_by_name(a_cert_name);
if (!l_cert) {
- log_it(L_ERROR,"l_cert is NULL by dap_cert_find_by_name");
+ log_it(L_ERROR, "Certificate %s not found", a_cert_name);
return;
}
a_client->auth_cert = l_cert;
diff --git a/net/client/include/dap_client.h b/net/client/include/dap_client.h
index 916d15462..9d7ae83f7 100644
--- a/net/client/include/dap_client.h
+++ b/net/client/include/dap_client.h
@@ -164,7 +164,6 @@ dap_stream_worker_t * dap_client_get_stream_worker(dap_client_t * a_client);
dap_stream_ch_t * dap_client_get_stream_ch_unsafe(dap_client_t * a_client, uint8_t a_ch_id);
uint32_t dap_client_get_stream_id(dap_client_t * a_client);
void dap_client_set_active_channels_unsafe (dap_client_t * a_client, const char * a_active_channels);
-void dap_client_set_auth_cert_unsafe(dap_client_t * a_client, dap_cert_t *a_cert);
void dap_client_set_auth_cert(dap_client_t *a_client, const char *a_cert_name);
dap_client_stage_t dap_client_get_stage(dap_client_t * a_client);
diff --git a/net/server/http_server/dap_http_simple.c b/net/server/http_server/dap_http_simple.c
index 0a14a37e6..6f028dc89 100644
--- a/net/server/http_server/dap_http_simple.c
+++ b/net/server/http_server/dap_http_simple.c
@@ -322,7 +322,7 @@ inline static void s_write_response_bad_request( dap_http_simple_t * a_http_simp
*/
static bool s_proc_queue_callback(void *a_arg)
{
- dap_http_simple_t *l_http_simple = (dap_http_simple_t*) a_arg;
+ dap_http_simple_t *l_http_simple = (dap_http_simple_t*) a_arg;
log_it(L_DEBUG, "dap http simple proc");
if (!l_http_simple->http_client) {
log_it(L_ERROR, "[!] HTTP client is already deleted!");
--
GitLab