unified MX27, MX25, MX37 trees

[karo-tx-redboot.git] / packages / infra / v2_0 / src / diag.cxx

diff --git a/packages/infra/v2_0/src/diag.cxx b/packages/infra/v2_0/src/diag.cxx
index 95c014b7122185b397ff8cec7427f31318b0cb38..a780324dce11799841c4c5b919424561be15c0de 100644 (file)
--- a/packages/infra/v2_0/src/diag.cxx
+++ b/packages/infra/v2_0/src/diag.cxx
@@ -64,7 +64,7 @@
 #include <stdarg.h>
 #include <limits.h>
 #include <ctype.h>
-
+  
 #ifdef CYG_HAL_DIAG_LOCK_DATA_DEFN
 CYG_HAL_DIAG_LOCK_DATA_DEFN;
 #endif
@@ -379,7 +379,7 @@ _vprintf(void (*putc)(char c, void *param), void *param, const char *fmt, va_lis
                     // Mask to unsigned, sized quantity
                     if (islong) {
                         val &= ((long long)1 << (sizeof(long) * 8)) - 1;
-                    } else{
+                    } else if (!islonglong) { // no need to mask longlong
                         val &= ((long long)1 << (sizeof(int) * 8)) - 1;
                     }
                 }
@@ -494,7 +494,7 @@ _vprintf(void (*putc)(char c, void *param), void *param, const char *fmt, va_lis
                 c = *cp++;
 #if CYGINT_ISO_CTYPE
                 if (isprint(c) || isspace(c)) {
-                       (*putc)(c, param);
+                (*putc)(c, param);
                } else if (iscntrl(c)) {
                        (*putc)('\\', param);
                        (*putc)('C', param);