diff --git a/.vscode/launch.json b/.vscode/launch.json
index 253788a..887a884 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -5,10 +5,10 @@
"name": "(gdb) Debug",
"type": "cppdbg",
"request": "launch",
- "program": "$kerep.com",
+ "program": "${workspaceFolder}/bin/kerep.com",
+ "cwd": "${workspaceFolder}/bin",
"preLaunchTask": "build_exec_dbg",
"stopAtEntry": false,
- "cwd": "${fileDirname}/bin",
"externalConsole": false,
"MIMode": "gdb",
"miDebuggerPath": "gdb",
@@ -31,8 +31,8 @@
"request": "launch",
"preLaunchTask": "build_exec_dbg",
"program": "${workspaceFolder}/bin/kerep.com",
+ "cwd": "${workspaceFolder}/bin",
"stopAtEntry": false,
- "cwd": "${workspaceFolder}",
"externalConsole": false,
"miDebuggerPath": "/usr/bin/gdb",
"MIMode": "gdb",
@@ -48,8 +48,8 @@
"type": "cppvsdbg",
"request": "launch",
"preLaunchTask": "build_dbg",
- "cwd": "${workspaceFolder}\\bin",
"program": "${workspaceFolder}\\bin\\kerep.com",
+ "cwd": "${workspaceFolder}\\bin",
"stopAtEntry": false,
"console": "integratedTerminal"
}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 7fb803b..f24315b 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -3,32 +3,6 @@
"version": "2.0.0",
"tasks": [
- {
- "label": "build_exec",
- "detail": "build project",
- "type": "cppbuild",
- "command": "make",
- "args": [
- "build_exec"
- ],
- "options": {
- "cwd": "${workspaceFolder}"
- },
- "problemMatcher": ["$gcc"],
- "group": {
- "kind": "build",
- "isDefault": true
- },
- "presentation": {
- "echo": true,
- "reveal": "always",
- "focus": true,
- "panel": "shared",
- "showReuseMessage": false,
- "clear": true
- }
- },
-
{
"label": "build_exec_dbg",
"detail": "build project with debug symbols",
diff --git a/cbuild b/cbuild
index 47808ee..15a9661 160000
--- a/cbuild
+++ b/cbuild
@@ -1 +1 @@
-Subproject commit 47808ee989c85b6d011851dbec24c39580b55cbb
+Subproject commit 15a9661c467facf65b2155eab3fad1ecf5f0c945
diff --git a/default.config b/default.config
index 23c2c06..3719daa 100644
--- a/default.config
+++ b/default.config
@@ -1,5 +1,5 @@
#!/bin/bash
-CBUILD_VERSION=3
+CBUILD_VERSION=4
CONFIG_VERSION=4
PROJECT=kerep
@@ -26,7 +26,7 @@ case $TASK in
CPP_ARGS="$C_ARGS"
LINKER_ARGS=""
TASK_SCRIPT=cbuild/default_tasks/build_exec.sh
- PRE_TASK_SCRIPT=tasks/pre_build.sh
+ PRE_TASK_SCRIPT=
POST_TASK_SCRIPT=
;;
build_exec_dbg)
@@ -34,7 +34,7 @@ case $TASK in
CPP_ARGS="$C_ARGS"
LINKER_ARGS=""
TASK_SCRIPT=cbuild/default_tasks/build_exec.sh
- PRE_TASK_SCRIPT=tasks/pre_build.sh
+ PRE_TASK_SCRIPT=
POST_TASK_SCRIPT=
;;
build_shared_lib)
@@ -42,7 +42,7 @@ case $TASK in
CPP_ARGS="$C_ARGS"
LINKER_ARGS="-Wl,-soname,$SHARED_LIB_FILE"
TASK_SCRIPT=cbuild/default_tasks/build_shared_lib.sh
- PRE_TASK_SCRIPT=tasks/pre_build.sh
+ PRE_TASK_SCRIPT=
POST_TASK_SCRIPT=
;;
build_shared_lib_dbg)
@@ -50,21 +50,21 @@ case $TASK in
CPP_ARGS="$C_ARGS"
LINKER_ARGS="-Wl,-soname,$SHARED_LIB_FILE"
TASK_SCRIPT=cbuild/default_tasks/build_shared_lib.sh
- PRE_TASK_SCRIPT=tasks/pre_build.sh
+ PRE_TASK_SCRIPT=
POST_TASK_SCRIPT=
;;
build_static_lib)
C_ARGS="-O2 -fpic"
CPP_ARGS="$C_ARGS"
TASK_SCRIPT=cbuild/default_tasks/build_static_lib.sh
- PRE_TASK_SCRIPT=tasks/pre_build.sh
+ PRE_TASK_SCRIPT=
POST_TASK_SCRIPT=
;;
build_static_lib_dbg)
C_ARGS="-O0 -g"
CPP_ARGS="$C_ARGS"
TASK_SCRIPT=cbuild/default_tasks/build_static_lib.sh
- PRE_TASK_SCRIPT=tasks/pre_build.sh
+ PRE_TASK_SCRIPT=
POST_TASK_SCRIPT=
;;
exec)
@@ -75,3 +75,14 @@ case $TASK in
TASK_SCRIPT=cbuild/default_tasks/valgrind.sh
;;
esac
+
+case $OS in
+ WINDOWS)
+ ;;
+ LINUX)
+ ;;
+ *)
+ printf "${RED}operating system $OS has no configuration variants\n"
+ exit 1
+ ;;
+esac
diff --git a/kerep.vcxproj b/kerep.vcxproj
index 33807a4..2a8ffb6 100644
--- a/kerep.vcxproj
+++ b/kerep.vcxproj
@@ -19,46 +19,88 @@
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -156,7 +198,7 @@
stdc17
Speed
- /Zc:twoPhase- /MP -fms-compatibility-version=14 %(AdditionalOptions)
+ /Zc:twoPhase- /MP -fms-compatibility-version=14 -Wno-clang-analyzer-valist.Uninitialized %(AdditionalOptions)
Default
stdcpp17
None
@@ -182,7 +224,7 @@
stdc17
Speed
- /Zc:twoPhase- /MP -fms-compatibility-version=14 %(AdditionalOptions)
+ /Zc:twoPhase- /MP -fms-compatibility-version=14 -Wno-clang-analyzer-valist.Uninitialized %(AdditionalOptions)
MultiThreadedDLL
Default
stdcpp17
@@ -208,7 +250,7 @@
stdc17
Speed
- /Zc:twoPhase- /MP -fms-compatibility-version=14 %(AdditionalOptions)
+ /Zc:twoPhase- /MP -fms-compatibility-version=14 -Wno-clang-analyzer-valist.Uninitialized %(AdditionalOptions)
Default
stdcpp17
None
@@ -235,7 +277,7 @@
stdc17
Speed
- /Zc:twoPhase- /MP -fms-compatibility-version=14 %(AdditionalOptions)
+ /Zc:twoPhase- /MP -fms-compatibility-version=14 -Wno-clang-analyzer-valist.Uninitialized %(AdditionalOptions)
MultiThreadedDLL
Default
stdcpp17
@@ -252,4 +294,4 @@
-
+
\ No newline at end of file
diff --git a/src/base/std.h b/src/base/std.h
index bc45b55..9f6b7d9 100644
--- a/src/base/std.h
+++ b/src/base/std.h
@@ -67,7 +67,7 @@ typedef uint8 bool;
#endif
#ifndef sprintf_s
- #define sprintf_s(BUF, BUFSIZE, FORMAT, ...) sprintf(BUF, FORMAT, ## __VA_ARGS__)
+ //#define sprintf_s(BUF, BUFSIZE, FORMAT, ...) sprintf(BUF, FORMAT, ## __VA_ARGS__)
#endif
diff --git a/src/base/type_system/base_toString.c b/src/base/type_system/base_toString.c
index 0e33986..68c5324 100644
--- a/src/base/type_system/base_toString.c
+++ b/src/base/type_system/base_toString.c
@@ -67,7 +67,10 @@ char* toString_uint(uint64 n, bool withPostfix, bool uppercase){
throw("too big precision");\
if(precision==0)\
precision=toString_float_default_precision;\
- int cn=sprintf(str, "%.*f", precision, n);\
+ int cn=IFMSC(\
+ sprintf_s(str, bufsize, "%.*f", precision, n),\
+ sprintf(str, "%.*f", precision, n)\
+ );\
/* remove trailing zeroes except .0*/\
while(str[cn-1]=='0' && str[cn-2]!='.')\
cn--;\
diff --git a/src/kprint/kprintf.c b/src/kprint/kprintf.c
index baba98e..261c649 100644
--- a/src/kprint/kprintf.c
+++ b/src/kprint/kprintf.c
@@ -133,7 +133,7 @@ void kprintf(const char* format, ...){
putc(c,stdout);
}
#if defined(_WIN64) || defined(_WIN32)
- end_iteration:
+ end_iteration:;
#endif
}
va_end(vl);