Skip to content
Snippets Groups Projects
Commit e85f8701 authored by dmitriy.gerasimov's avatar dmitriy.gerasimov
Browse files

Merge branch 'CertificateManager' into 'master'

Certificate manager

See merge request !138
parents d3c0d7f8 5d816604
No related branches found
No related tags found
2 merge requests!148Master,!138Certificate manager
Pipeline #4121 passed with stage
in 12 seconds
...@@ -24,10 +24,16 @@ ...@@ -24,10 +24,16 @@
#pragma once #pragma once
#include <string.h> #include <string.h>
#include "dap_common.h" #include "dap_common.h"
#include "dap_list.h" #include "dap_list.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef const char *dap_binary_tree_key_t; typedef const char *dap_binary_tree_key_t;
#define KEY_LS(a, b) (strcmp(a, b) < 0) #define KEY_LS(a, b) (strcmp(a, b) < 0)
#define KEY_GT(a, b) (strcmp(a, b) > 0) #define KEY_GT(a, b) (strcmp(a, b) > 0)
...@@ -48,3 +54,8 @@ dap_binary_tree_t *dap_binary_tree_insert(dap_binary_tree_t *a_tree_root, dap_bi ...@@ -48,3 +54,8 @@ dap_binary_tree_t *dap_binary_tree_insert(dap_binary_tree_t *a_tree_root, dap_bi
dap_binary_tree_t *dap_binary_tree_delete(dap_binary_tree_t *a_tree_root, dap_binary_tree_key_t a_key); dap_binary_tree_t *dap_binary_tree_delete(dap_binary_tree_t *a_tree_root, dap_binary_tree_key_t a_key);
size_t dap_binary_tree_count(dap_binary_tree_t *a_tree_root); size_t dap_binary_tree_count(dap_binary_tree_t *a_tree_root);
void dap_binary_tree_clear(dap_binary_tree_t *a_tree_root); void dap_binary_tree_clear(dap_binary_tree_t *a_tree_root);
#ifdef __cplusplus
}
#endif
...@@ -5,6 +5,12 @@ ...@@ -5,6 +5,12 @@
#ifndef __DAP_LIST_H__ #ifndef __DAP_LIST_H__
#define __DAP_LIST_H__ #define __DAP_LIST_H__
#ifdef __cplusplus
extern "C" {
#endif
typedef void (*dap_callback_destroyed_t)(void* data); typedef void (*dap_callback_destroyed_t)(void* data);
typedef void (*dap_callback_t)(void* data, void* user_data); typedef void (*dap_callback_t)(void* data, void* user_data);
typedef void* (*dap_callback_copy_t)(const void * src, void* data); typedef void* (*dap_callback_copy_t)(const void * src, void* data);
...@@ -60,3 +66,8 @@ void* dap_list_nth_data(dap_list_t *list, unsigned int n); ...@@ -60,3 +66,8 @@ void* dap_list_nth_data(dap_list_t *list, unsigned int n);
#define dap_list_next(list) ((list) ? (((dap_list_t *)(list))->next) : NULL) #define dap_list_next(list) ((list) ? (((dap_list_t *)(list))->next) : NULL)
#endif /* __DAP_LIST_H__ */ #endif /* __DAP_LIST_H__ */
#ifdef __cplusplus
}
#endif
...@@ -236,7 +236,7 @@ int dap_common_init( const char *a_console_title, const char *a_log_filename ) { ...@@ -236,7 +236,7 @@ int dap_common_init( const char *a_console_title, const char *a_log_filename ) {
s_log_file = fopen( a_log_filename , "w" ); s_log_file = fopen( a_log_filename , "w" );
if ( s_log_file == NULL ) { if ( s_log_file == NULL ) {
dap_fprintf( stderr, "Can't open log file %s to append\n", a_log_filename ); dap_fprintf( stderr, "Can't open log file %s to append\n", a_log_filename );
return -1; //return -1; //switch off show log in cosole if file not open
} }
dap_stpcpy(s_log_file_path, a_log_filename); dap_stpcpy(s_log_file_path, a_log_filename);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment