source id type is unsigned; minor cleanup

[wxWidgets.git] / src / common / wxchar.cpp

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index c63bfcc55255ac9f774fbe34a393bfbb39be94d0..cf4e0a5be555a94bb9ccf9090612ccf400f95d6f 100644 (file)
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -243,7 +243,7 @@ typedef union {
     int pad_int;                        //  %d, %i, %o, %u, %x, %X
     long int pad_longint;               // %ld, etc
 #ifdef wxLongLong_t
-    long long int pad_longlongint;      // %Ld, etc
+    wxLongLong_t pad_longlongint;      // %Ld, etc
 #endif
     size_t pad_sizet;                   // %Zd, etc
 
@@ -534,9 +534,9 @@ bool wxPrintfConvSpec::Parse(const wxChar *format)
                 else if (ilen == 2)
 #ifdef wxLongLong_t
                     m_type = wxPAT_LONGLONGINT;
-#else // !long long
+#else // !wxLongLong_t
                     m_type = wxPAT_LONGINT;
-#endif // long long/!long long
+#endif // wxLongLong_t/!wxLongLong_t
                 else if (ilen == 3)
                     m_type = wxPAT_SIZET;
                 done = true;
@@ -704,9 +704,9 @@ bool wxPrintfConvSpec::LoadArg(wxPrintfArg *p, va_list &argptr)
             break;
 #ifdef wxLongLong_t
         case wxPAT_LONGLONGINT:
-            p->pad_longlongint = va_arg(argptr, long long int);
+            p->pad_longlongint = va_arg(argptr, wxLongLong_t);
             break;
-#endif
+#endif // wxLongLong_t
         case wxPAT_SIZET:
             p->pad_sizet = va_arg(argptr, size_t);
             break;
@@ -1199,7 +1199,11 @@ int WXDLLEXPORT wxVsnprintf_(wxChar *buf, size_t lenMax,
         return lenMax+1;     // not enough space in the output buffer !
     }
 
-    wxASSERT(lenCur == wxStrlen(buf));
+    // Don't do:
+    //      wxASSERT(lenCur == wxStrlen(buf));
+    // in fact if we embedded NULLs in the output buffer (using %c with a '\0')
+    // such check would fail
+
     return lenCur;
 }