chenlin/Mujoco_WASM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert mju_error and mju_warning to variadic functions, supporting printf-like arguments. The functions mju_error_i, mju_error_s, mju_warning_i, and mju_warning_s are now deprecated.

Browse Source 
PiperOrigin-RevId: 515431052
Change-Id: I440de0cb417ce216b6d636a5d86dc9ef6cc1fc06
This commit is contained in:
Kyle Bayes
2023-03-09 13:50:39 -08:00
committed by Copybara-Service
parent 2e6a37e8c5
commit d3d789cf7d
33 changed files with 177 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/engine_print.c
+6 -6
View File
@@ -139,13 +139,13 @@ static bool validateFloatFormat(const char* float_format) {
// example valid format string: "% -9.2g"
if (strnlen(float_format, FLOAT_FORMAT_MAX_LEN + 1) > FLOAT_FORMAT_MAX_LEN) {
mju_warning_i("Format string longer than limit of %d.", FLOAT_FORMAT_MAX_LEN);
mju_warning("Format string longer than limit of %d.", FLOAT_FORMAT_MAX_LEN);
return false;
}
int cur_idx = 0;
if (float_format[cur_idx] != '%') {
mju_warning("Format string must start with '%'.");
mju_warning("Format string must start with '%%'.");
return false;
}
cur_idx++;
@@ -192,8 +192,8 @@ static bool validateFloatFormat(const char* float_format) {
if (float_format[cur_idx] == '\0') {
return true;
} else {
mju_warning_s("Unable to match format string %s with expected pattern for a single float.",
float_format);
mju_warning("Unable to match format string %s with expected pattern for a single float.",
float_format);
return false;
}
}
@@ -219,7 +219,7 @@ void mj_printFormattedModel(const mjModel* m, const char* filename, const char*
// check for nullptr
if (!fp) {
mju_warning_s("Could not open file '%s' for writing mjModel", filename);
mju_warning("Could not open file '%s' for writing mjModel", filename);
return;
}
@@ -748,7 +748,7 @@ void mj_printFormattedData(const mjModel* m, mjData* d, const char* filename,
// check for nullptr
if (!fp) {
mju_warning_s("Could not open file '%s' for writing mjModel", filename);
mju_warning("Could not open file '%s' for writing mjModel", filename);
mjFREESTACK;
return;
}