aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Common
diff options
context:
space:
mode:
authorAvi Levkovich <avi@twine-s.com>2020-11-22 11:31:17 +0200
committerAvi Levkovich <avi@twine-s.com>2020-11-22 11:31:17 +0200
commit712a01ddb6ba8e226d6532cdb834ad8e8b521cd5 (patch)
treed3f6744f637743fbe338ba7e68d627be1437f500 /Software/Embedded_SW/Embedded/Common
parent58d96d90f9422d390658d328d4f6eb3b86d168fa (diff)
parenta5776d0c00f131ec71b5e0300a0282b224530b0d (diff)
downloadTango-712a01ddb6ba8e226d6532cdb834ad8e8b521cd5.tar.gz
Tango-712a01ddb6ba8e226d6532cdb834ad8e8b521cd5.zip
merge conflict
Diffstat (limited to 'Software/Embedded_SW/Embedded/Common')
-rw-r--r--Software/Embedded_SW/Embedded/Common/Utilities/ustdlib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Software/Embedded_SW/Embedded/Common/Utilities/ustdlib.c b/Software/Embedded_SW/Embedded/Common/Utilities/ustdlib.c
index 420e1dbc3..749152b2e 100644
--- a/Software/Embedded_SW/Embedded/Common/Utilities/ustdlib.c
+++ b/Software/Embedded_SW/Embedded/Common/Utilities/ustdlib.c
@@ -819,7 +819,7 @@ usnprintf(char * restrict s, size_t n, const char * restrict format, ...)
//
// Call vsnprintf to perform the conversion.
//
- ret = uvsnprintf(s, n, format, arg);
+ ret = vsnprintf(s, n, format, arg);
//
// End the varargs processing.