From: Michael Wetherell <mike.wetherell@ntlworld.com>
Date: Fri, 11 Nov 2005 16:55:03 +0000 (+0000)
Subject: Warning fixes
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0519aac9dbd362dd3e20611eba6a6e979e9c43a5

Warning fixes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/tests/regex/regextest.cpp b/tests/regex/regextest.cpp
index c146caf672..e5a0c89f3d 100644
--- a/tests/regex/regextest.cpp
+++ b/tests/regex/regextest.cpp
@@ -256,16 +256,18 @@ void RegExTestCase::doTest(int flavor)
         return;
 
     // check wxRegEx has correctly counted the number of subexpressions
-    failIf(m_expected.size() != re.GetMatchCount(),
-           wxString::Format(_T("GetMatchCount() == %d, expected %d"),
-                            re.GetMatchCount(), m_expected.size()));
-
-    wxString result;
-    size_t start, len;
+    wxString msg;
+    msg << _T("GetMatchCount() == ") << re.GetMatchCount()
+        << _T(", expected ") << m_expected.size();
+    failIf(m_expected.size() != re.GetMatchCount(), msg);
 
     for (size_t i = 0; i < m_expected.size(); i++) {
-        failIf(!re.GetMatch(&start, &len, i), wxString::Format(
-                _T("wxRegEx::GetMatch failed for match %d"), i));
+        wxString result;
+        size_t start, len;
+
+        msg.clear();
+        msg << _T("wxRegEx::GetMatch failed for match ") << i;
+        failIf(!re.GetMatch(&start, &len, i), msg);
 
         // m - check the match returns the strings given
         if (m_mode == 'm')
@@ -276,14 +278,17 @@ void RegExTestCase::doTest(int flavor)
 
         // i - check the match returns the offsets given
         else if (m_mode == 'i')
-            if (start < INT_MAX)
-                result = wxString::Format(_T("%d %d"), start, start + len - 1);
-            else
+            if (start > INT_MAX)
                 result = _T("-1 -1");
+            else if (start + len > 0)
+                result << start << _T(" ") << start + len - 1;
+            else
+                result << start << _T(" -1");
 
-        failIf(result != m_expected[i], wxString::Format(
-                _T("match(%d) == %s, expected == %s"), i,
-                quote(result).c_str(), quote(m_expected[i]).c_str()));
+        msg.clear();
+        msg << _T("match(") << i << _T(") == ") << quote(result)
+            << _T(", expected == ") << quote(m_expected[i]);
+        failIf(result != m_expected[i], msg);
     }
 }