no real changes, just replaced a long preprocessor expression occuring in 2 places...

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

diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index 1aeaec1b172f768a8e67135394eae75bd88d7daf..f8c44d136151fa2830d7b3720d949650159f63d1 100644 (file)
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -196,26 +196,32 @@ bool WXDLLEXPORT wxOKlibc()
 //     implemented later in this file using wxVsnprintf() and that would
 //     result in an endless recursion and thus in a stack overflow
 #if wxUSE_UNICODE
 //     implemented later in this file using wxVsnprintf() and that would
 //     result in an endless recursion and thus in a stack overflow
 #if wxUSE_UNICODE

-

     #if defined(__WINDOWS__)
         // all compilers under Windows should have swprintf()
         #define HAVE_SWPRINTF
     #endif
     #if defined(__WINDOWS__)
         // all compilers under Windows should have swprintf()
         #define HAVE_SWPRINTF
     #endif

-    #if defined(__WXWINCE__) || ( defined(__VISUALC__) && __VISUALC__ <= 1200 ) || defined(__GNUWIN32__)
+
+    // NB: MSVC 6 has only non-standard swprintf() declaration and while MSVC 7
+    //     and 7.1 do have the standard one, it's completely broken unless
+    //     /Zc:wchar_t is used while the other one works so use it instead, and
+    //     only VC8 has a working standard-compliant swprintf()
+    #if defined(__WXWINCE__) || \
+        (defined(__VISUALC__) && __VISUALC__ < 1400) || \
+        defined(__GNUWIN32__) || \
+        defined(__BORLANDC__)

         #define HAVE_BROKEN_SWPRINTF_DECL
     #endif
 
         #define HAVE_BROKEN_SWPRINTF_DECL
     #endif
 

-
-    // problem: on some systems swprintf takes the 'max' argument while on others
-    //          it doesn't
+    // problem: on some systems swprintf takes the 'max' argument while on
+    // others it doesn't

     #if defined(HAVE_BROKEN_SWPRINTF_DECL)
     #if defined(HAVE_BROKEN_SWPRINTF_DECL)

-
-        // like when using sprintf(), since 'max' is not used, wxVsnprintf() should
-        // always ensure that 'buff' is big enough for all common needs
+        // like when using sprintf(), since 'max' is not used, wxVsnprintf()
+        // should always ensure that 'buff' is big enough for all common needs

         #define system_sprintf(buff, max, flags, data)      \
             ::swprintf(buff, flags, data)
         #define system_sprintf(buff, max, flags, data)      \
             ::swprintf(buff, flags, data)

-    #else

 
 

+        #define SYSTEM_SPRINTF_IS_UNSAFE
+    #else

         #if !defined(HAVE_SWPRINTF)
             #error wxVsnprintf() needs a system swprintf() implementation!
         #endif
         #if !defined(HAVE_SWPRINTF)
             #error wxVsnprintf() needs a system swprintf() implementation!
         #endif


@@ -223,24 +229,24 @@ bool WXDLLEXPORT wxOKlibc()
         #define system_sprintf(buff, max, flags, data)      \
             ::swprintf(buff, max, flags, data)
     #endif
         #define system_sprintf(buff, max, flags, data)      \
             ::swprintf(buff, max, flags, data)
     #endif

-
-#else
-
-    #if defined(HAVE_SNPRINTF)
-
+#else // !wxUSE_UNICODE
+    #if defined(__VISUALC__) || \
+            (defined(__BORLANDC__) && __BORLANDC__ >= 0x540)
+        #define system_sprintf(buff, max, flags, data)      \
+            ::_snprintf(buff, max, flags, data)
+    #elif defined(HAVE_SNPRINTF)

         #define system_sprintf(buff, max, flags, data)      \
             ::snprintf(buff, max, flags, data)
         #define system_sprintf(buff, max, flags, data)      \
             ::snprintf(buff, max, flags, data)

-
-    #else       // NB: at least sprintf() should *always* be available
-
-        // since 'max' is not used in this case, wxVsnprintf() should always ensure
-        // that 'buff' is big enough for all common needs
+    #else       // NB: at least sprintf() should always be available
+        // since 'max' is not used in this case, wxVsnprintf() should always
+        // ensure that 'buff' is big enough for all common needs

         // (see wxMAX_SVNPRINTF_FLAGBUFFER_LEN and wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN)
         #define system_sprintf(buff, max, flags, data)      \
             ::sprintf(buff, flags, data)
 
         // (see wxMAX_SVNPRINTF_FLAGBUFFER_LEN and wxMAX_SVNPRINTF_SCRATCHBUFFER_LEN)
         #define system_sprintf(buff, max, flags, data)      \
             ::sprintf(buff, flags, data)
 

+        #define SYSTEM_SPRINTF_IS_UNSAFE

     #endif
     #endif

-#endif
+#endif // wxUSE_UNICODE/!wxUSE_UNICODE

 
 
 
 
 
 


@@ -394,7 +400,7 @@ bool wxPrintfConvSpec::Parse(const wxChar *format)
 #define CHECK_PREC \
         if (in_prec && !prec_dot) \
         { \
 #define CHECK_PREC \
         if (in_prec && !prec_dot) \
         { \

-            m_szFlags[flagofs++] = '.'; \
+            m_szFlags[flagofs++] = wxT('.'); \

             prec_dot = true; \
         }
 
             prec_dot = true; \
         }
 


@@ -534,7 +540,7 @@ bool wxPrintfConvSpec::Parse(const wxChar *format)
             case wxT('X'):
                 CHECK_PREC
                 m_szFlags[flagofs++] = ch;
             case wxT('X'):
                 CHECK_PREC
                 m_szFlags[flagofs++] = ch;

-                m_szFlags[flagofs] = '\0';
+                m_szFlags[flagofs] = wxT('\0');

                 if (ilen == 0)
                     m_type = wxPAT_INT;
                 else if (ilen == -1)
                 if (ilen == 0)
                     m_type = wxPAT_INT;
                 else if (ilen == -1)


@@ -562,7 +568,7 @@ bool wxPrintfConvSpec::Parse(const wxChar *format)
             case wxT('G'):
                 CHECK_PREC
                 m_szFlags[flagofs++] = ch;
             case wxT('G'):
                 CHECK_PREC
                 m_szFlags[flagofs++] = ch;

-                m_szFlags[flagofs] = '\0';
+                m_szFlags[flagofs] = wxT('\0');

                 if (ilen == 2)
                     m_type = wxPAT_LONGDOUBLE;
                 else
                 if (ilen == 2)
                     m_type = wxPAT_LONGDOUBLE;
                 else


@@ -670,7 +676,10 @@ void wxPrintfConvSpec::ReplaceAsteriskWith(int width)
     }
 
     // replace * with the actual integer given as width
     }
 
     // replace * with the actual integer given as width

-    int maxlen = (m_szFlags + wxMAX_SVNPRINTF_FLAGBUFFER_LEN - pwidth) / sizeof(wxChar);
+#ifndef SYSTEM_SPRINTF_IS_UNSAFE
+    int maxlen = (m_szFlags + wxMAX_SVNPRINTF_FLAGBUFFER_LEN - pwidth) /
+                        sizeof(wxChar);
+#endif

     int offset = system_sprintf(pwidth, maxlen, wxT("%d"), abs(width));
 
     // restore after the expanded * what was following it
     int offset = system_sprintf(pwidth, maxlen, wxT("%d"), abs(width));
 
     // restore after the expanded * what was following it


@@ -729,7 +738,7 @@ bool wxPrintfConvSpec::LoadArg(wxPrintfArg *p, va_list &argptr)
             break;
 
         case wxPAT_CHAR:
             break;
 
         case wxPAT_CHAR:

-            p->pad_char = va_arg(argptr, int);  // char is promoted to int when passed through '...'
+            p->pad_char = (char)va_arg(argptr, int);  // char is promoted to int when passed through '...'

             break;
         case wxPAT_WCHAR:
             p->pad_wchar = (wchar_t)va_arg(argptr, int);  // char is promoted to int when passed through '...'
             break;
         case wxPAT_WCHAR:
             p->pad_wchar = (wchar_t)va_arg(argptr, int);  // char is promoted to int when passed through '...'


@@ -954,6 +963,10 @@ int wxPrintfConvSpec::Process(wxChar *buf, size_t lenMax, wxPrintfArg *p)
             return -1;
     }
 
             return -1;
     }
 

+#ifdef HAVE_BROKEN_SWPRINTF_DECL
+    wxUnusedVar(lenScratch);    // avoid dummy warnings
+#endif
+

     // if we used system's sprintf() then we now need to append the s_szScratch
     // buffer to the given one...
     switch (m_type)
     // if we used system's sprintf() then we now need to append the s_szScratch
     // buffer to the given one...
     switch (m_type)