Merge remote branch 'origin/mdb.master'

[openldap] / contrib / ldapc++ / src / StringList.cpp

diff --git a/contrib/ldapc++/src/StringList.cpp b/contrib/ldapc++/src/StringList.cpp
index 4189c392007b209db87e2239a1321477f9b4aaa9..44dd1ed879011ccebb5a169ca3700ef72131e941 100644 (file)
--- a/contrib/ldapc++/src/StringList.cpp
+++ b/contrib/ldapc++/src/StringList.cpp
@@ -1,21 +1,26 @@
+// $OpenLDAP$
 /*
- * Copyright 2000, OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2011 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
 #include "StringList.h"
 #include "debug.h"
 
+#include <cstdlib>
+
+using namespace std;
+
 StringList::StringList(){
 }
 
 StringList::StringList(const StringList& sl){
-    m_data= ListType(sl.m_data);
+    m_data= StringList::ListType(sl.m_data);
 }
 
 StringList::StringList(char** values){
     if(values == 0){
-        m_data=ListType();
+        m_data=StringList::ListType();
     }else{
         char** i;
         for(i=values; *i != 0; i++){
@@ -29,12 +34,12 @@ StringList::~StringList(){
 }
 
 char** StringList::toCharArray() const{
-    if(size() > 0){
-        char** ret = new char*[size()+1];
+    if(!empty()){
+        char** ret = (char**) malloc(sizeof(char*) * (size()+1));
         StringList::const_iterator i;
         int j=0;
         for(i=begin(); i != end(); i++,j++){
-            ret[j]=new char[i->size()+1];
+            ret[j]=(char*) malloc(sizeof(char) * (i->size()+1));
             i->copy(ret[j],string::npos);
             ret[j][i->size()]=0;
         }
@@ -53,6 +58,10 @@ size_t StringList::size() const{
     return m_data.size();
 }
 
+bool StringList::empty() const{
+    return m_data.empty();
+}
+
 StringList::const_iterator StringList::begin() const{
     return m_data.begin();
 }