ModelicaUtilities should output to the chosen log format

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@24385 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Feb 3, 2015 · 27f7b48 · 27f7b48
1 parent aa21603
commit 27f7b48
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/SimulationRuntime/c/util/ModelicaUtilities.c b/SimulationRuntime/c/util/ModelicaUtilities.c
@@ -43,8 +43,7 @@ void ModelicaMessage(const char* string) {
 }
 
 extern void ModelicaVFormatMessage(const char*string, va_list args) {
-  vfprintf(stdout, string, args);
-  fflush(stdout);
+  va_infoStreamPrint(LOG_STDOUT, 0, string, args);
 }
 
 void ModelicaFormatMessage(const char* string,...) {
@@ -56,16 +55,12 @@ void ModelicaFormatMessage(const char* string,...) {
 
 MODELICA_NORETURN void OpenModelica_Simulation_ModelicaError(const char* string) MODELICA_NORETURNATTR;
 void OpenModelica_Simulation_ModelicaError(const char* string) {
-  fputs(string, stderr);
-  fflush(stderr);
-  omc_throw(NULL);
+  throwStreamPrint(LOG_STDOUT, "%s", string);
 }
 
 MODELICA_NORETURN void OpenModelica_Simulation_ModelicaVFormatError(const char*string, va_list args) MODELICA_NORETURNATTR;
 void OpenModelica_Simulation_ModelicaVFormatError(const char*string, va_list args) {
-  vfprintf(stderr, string, args);
-  fflush(stderr);
-  omc_throw(NULL);
+  va_throwStreamPrint(LOG_STDOUT, string, args);
 }
 
 MODELICA_NORETURN void (*OpenModelica_ModelicaError)(const char*) MODELICA_NORETURNATTR = OpenModelica_Simulation_ModelicaError;

diff --git a/SimulationRuntime/c/util/omc_error.c b/SimulationRuntime/c/util/omc_error.c
@@ -314,6 +314,15 @@ void setStreamPrintXML(int isXML)
 }
 
 #define SIZE_LOG_BUFFER 2048
+void va_infoStreamPrint(int stream, int indentNext, const char *format, va_list args)
+{
+  if (useStream[stream]) {
+    char logBuffer[SIZE_LOG_BUFFER];
+    vsnprintf(logBuffer, SIZE_LOG_BUFFER, format, args);
+    messageFunction(LOG_TYPE_INFO, stream, indentNext, logBuffer, 0, NULL);
+  }
+}
+
 void infoStreamPrintWithEquationIndexes(int stream, int indentNext, const int *indexes, const char *format, ...)
 {
   if (useStream[stream]) {

diff --git a/SimulationRuntime/c/util/omc_error.h b/SimulationRuntime/c/util/omc_error.h
@@ -158,6 +158,7 @@ void setStreamPrintXML(int isXML);
 
 extern void (*messageClose)(int stream);
 extern void (*messageCloseWarning)(int stream);
+extern void va_infoStreamPrint(int stream, int indentNext, const char *format, va_list ap);
 extern void infoStreamPrint(int stream, int indentNext, const char *format, ...) __attribute__ ((format (printf, 3, 4)));
 extern void infoStreamPrintWithEquationIndexes(int stream, int indentNext, const int *indexes, const char *format, ...) __attribute__ ((format (printf, 4, 5)));
 extern void warningStreamPrint(int stream, int indentNext, const char *format, ...) __attribute__ ((format (printf, 3, 4)));