0
@@ -404,7 +404,7 @@ bool BtreeBucket::unindex(const DiskLoc& thisLoc, IndexDetails& id, JSObj& key,
0
 }
0
 
0
 BtreeBucket* BtreeBucket::allocTemp() { 
0
-	BtreeBucket *b = (BtreeBucket*) safemalloc(BucketSize);
0
+	BtreeBucket *b = (BtreeBucket*) malloc(BucketSize);
0
   b->init();
0
   return b;
0
 }

0
@@ -234,7 +234,7 @@ void receivedQuery(DbResponse& dbresponse, /*AbstractMessagingPort& dbMsgPort, *
0
     problem() << " Caught Assertion in runQuery ns:" << ns << endl; 
0
     cout << "  ntoskip:" << ntoskip << " ntoreturn:" << ntoreturn << '\n';
0
     cout << "  query:" << query.toString() << '\n';
0
-		msgdata = (QueryResult*) safemalloc(sizeof(QueryResult));
0
+		msgdata = (QueryResult*) malloc(sizeof(QueryResult));
0
     QueryResult *qr = msgdata;
0
     qr->_data[0] = 0;
0
     qr->_data[1] = 0;
0
@@ -411,7 +411,7 @@ void jniCallback(Message& m, Message& out)
0
         // on a query, the Message must have m.freeIt true so that the buffer data can be 
0
         // retained by cursors.  As freeIt is false, we make a copy here.
0
         assert( m.data->len > 0 && m.data->len < 32000000 );
0
-				Message copy(safemalloc(m.data->len), true);
0
+				Message copy(malloc(m.data->len), true);
0
         memcpy(copy.data, m.data, m.data->len);
0
         DbResponse dbr;
0
         receivedQuery(dbr, copy, ss, false);
0
@@ -749,7 +749,7 @@ void initAndListen(int listenPort, const char *dbPath, const char *appserverLoc
0
      */
0
     
0
     if (dbPath && dbPath[strlen(dbPath)-1] != '/') {
0
-    	char *t = (char *) safemalloc(strlen(dbPath) + 2);
0
+    	char *t = (char *) malloc(strlen(dbPath) + 2);
0
       
0
       strcpy(t, dbPath);
0
       strcat(t, "/");

0
@@ -103,7 +103,7 @@ JavaJSImpl::JavaJSImpl(const char *appserverPath){
0
     ss << colon << getenv( "CLASSPATH" );
0
 
0
   string s = ss.str();
0
-  char * p = (char *)safemalloc( s.size() * 4 );
0
+  char * p = (char *)malloc( s.size() * 4 );
0
   strcpy( p , s.c_str() );
0
   char *q = p;
0
 #if defined(_WIN32)
0
@@ -288,7 +288,7 @@ JSObj JavaJSImpl::scopeGetObject( jlong id , const char * field )
0
 {
0
   int guess = _getEnv()->CallStaticIntMethod( _dbhook , _scopeGuessObjectSize , id , _getEnv()->NewStringUTF( field ) );
0
 
0
-  char * buf = (char *) safemalloc(guess);
0
+  char * buf = (char *) malloc(guess);
0
   jobject bb = _getEnv()->NewDirectByteBuffer( (void*)buf , guess );
0
   jassert( bb );
0
   

0
@@ -510,7 +510,7 @@ inline JSObj JSObj::copy() {
0
   if( isEmpty() )
0
     return *this;
0
 
0
-	char *p = (char*) safemalloc(objsize());
0
+	char *p = (char*) malloc(objsize());
0
   memcpy(p, objdata(), objsize());
0
   return JSObj(p, true);
0
 }

0
@@ -138,7 +138,7 @@ bool MessagingPort::recv(Message& m) {
0
   }
0
         
0
   int z = (len+1023)&0xfffffc00; assert(z>=len);
0
-	MsgData *md = (MsgData *) safemalloc(z);
0
+	MsgData *md = (MsgData *) malloc(z);
0
   md->len = len;
0
         
0
   if ( len <= 0 ){

0
@@ -140,11 +140,3 @@ using namespace boost::filesystem;
0
 #include "util/goodies.h"
0
 #include "util/log.h"
0
 
0
-inline void * safemalloc( size_t s ){
0
-  void * d = malloc( s );
0
-  if ( ! d ){
0
-    cerr << "malloc failed" << endl;
0
-    assert( 0 );
0
-  }
0
-  return d;
0
-}