Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
cellframe-sdk
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Code
Merge requests
16
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cellframe
cellframe-sdk
Commits
e85f8701
Commit
e85f8701
authored
4 years ago
by
dmitriy.gerasimov
Browse files
Options
Downloads
Plain Diff
Merge branch 'CertificateManager' into 'master'
Certificate manager See merge request
!138
parents
d3c0d7f8
5d816604
No related branches found
Branches containing commit
No related tags found
2 merge requests
!148
Master
,
!138
Certificate manager
Pipeline
#4121
passed with stage
Stage: analyze
in 12 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dap-sdk/core/include/dap_binary_tree.h
+11
-0
11 additions, 0 deletions
dap-sdk/core/include/dap_binary_tree.h
dap-sdk/core/include/dap_list.h
+11
-0
11 additions, 0 deletions
dap-sdk/core/include/dap_list.h
dap-sdk/core/src/dap_common.c
+1
-1
1 addition, 1 deletion
dap-sdk/core/src/dap_common.c
with
23 additions
and
1 deletion
dap-sdk/core/include/dap_binary_tree.h
+
11
−
0
View file @
e85f8701
...
@@ -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
This diff is collapsed.
Click to expand it.
dap-sdk/core/include/dap_list.h
+
11
−
0
View file @
e85f8701
...
@@ -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
This diff is collapsed.
Click to expand it.
dap-sdk/core/src/dap_common.c
+
1
−
1
View file @
e85f8701
...
@@ -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
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment