don't initialize m_str twice in wxCharBuffer ctor

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

include/wx/buffer.h

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        buffer.h
+// Name:        wx/buffer.h
 // Purpose:     auto buffer classes: buffers which automatically free memory
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -27,18 +27,17 @@ class wxCharBuffer
 {
 public:
     wxCharBuffer(const char *str)
-        : m_str(NULL)
+        : m_str(str ? strdup(str) : NULL)
     {
         wxASSERT_MSG( str, wxT("NULL string in wxCharBuffer") );
-
-        m_str = str ? strdup(str) : (char *)NULL;
     }
+
     wxCharBuffer(size_t len)
-        : m_str(NULL)
+        : m_str((char *)malloc((len + 1)*sizeof(char)))
     {
-        m_str = (char *)malloc(len+1);
         m_str[len] = '\0';
     }
+
     // no need to check for NULL, free() does it
     ~wxCharBuffer() { free(m_str); }
 
@@ -65,6 +64,7 @@ private:
 };
 
 #if wxUSE_WCHAR_T
+
 class wxWCharBuffer
 {
 public:
@@ -85,9 +85,8 @@ public:
         }
     }
     wxWCharBuffer(size_t len)
-        : m_wcs((wchar_t *)NULL)
+        : m_wcs((wchar_t *)malloc((len + 1)*sizeof(wchar_t)))
     {
-        m_wcs = (wchar_t *)malloc((len+1)*sizeof(wchar_t));
         m_wcs[len] = L'\0';
     }
 
@@ -115,7 +114,8 @@ public:
 private:
     wchar_t *m_wcs;
 };
-#endif
+
+#endif // wxUSE_WCHAR_T
 
 #if wxUSE_UNICODE
     #define wxMB2WXbuf wxWCharBuffer
@@ -129,8 +129,6 @@ private:
     #define wxWX2WCbuf wxWCharBuffer
 #endif // Unicode/ANSI
 
-
-
 // ----------------------------------------------------------------------------
 // A class for holding growable data buffers (not necessarily strings)
 // ----------------------------------------------------------------------------
@@ -139,13 +137,9 @@ class wxMemoryBuffer
 {
 public:
     enum { BLOCK_SIZE = 1024 };
-    wxMemoryBuffer(size_t size=wxMemoryBuffer::BLOCK_SIZE)
+    wxMemoryBuffer(size_t size = wxMemoryBuffer::BLOCK_SIZE)
-        : m_data(NULL), m_size(0), m_len(0)
+        : m_data(malloc(size)), m_size(size), m_len(0)
     {
-        wxASSERT(size > 0);
-        m_data = malloc(size);
-        wxASSERT(m_data != NULL);
-        m_size = size;
     }
 
     ~wxMemoryBuffer() { free(m_data); }
@@ -220,7 +214,6 @@ public:
 
 
 protected:
-
     void ResizeIfNeeded(size_t newSize)
     {
         if (newSize > m_size)
@@ -237,8 +230,6 @@ private:
     size_t      m_len;
 };
 
-
-
 // ----------------------------------------------------------------------------
 // template class for any kind of data
 // ----------------------------------------------------------------------------