Changeset 27517 for branches/eam_branches/20100225/Ohana/src/opihi/lib.shell/gprint.c

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/opihi/lib.shell/gprint.c (modified) (4 diffs)

branches/eam_branches/20100225/Ohana/src/opihi/lib.shell/gprint.c

@@ -305 +305 @@
   if (stream[0].mode == GP_FILE) {
     status = vfprintf (stream[0].file, format, argp);
+    fflush (stream[0].file);
     if (status < 0) {
       return (FALSE);
@@ -325 +326 @@
   if (stream[0].mode == GP_FILE) {
     fwrite (buffer, size, N, stream[0].file);
+    fflush (stream[0].file);
   } else {
     // XXX can we not use exising IOBuffer APIs here?
@@ -350 +352 @@
   // there are two strerror_r implementations; choose the right one:
 #if ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! _GNU_SOURCE)
-  errorMsg = strerror_r (myError, errorBuf, MAX_ERROR_LENGTH);
-#else
   strerror_r (myError, errorBuf, MAX_ERROR_LENGTH);
   errorMsg = errorBuf;
+#else
+  errorMsg = strerror_r (myError, errorBuf, MAX_ERROR_LENGTH);
 #endif
 
@@ -360 +362 @@
   va_end (argp);
 
-  gprintv (dest, "%s\n", errorMsg);
+  gprint (dest, "%s\n", errorMsg);
   return TRUE;
 }