r3514 - in trunk: libmnetutil/include/libmnetutil libmnetutil/source libmutil/source

[erik at minisip.org]

Author: erik
Date: 2007-11-23 13:36:29 +0100 (Fri, 23 Nov 2007)
New Revision: 3514

Modified:
   trunk/libmnetutil/include/libmnetutil/StreamSocket.h
   trunk/libmnetutil/source/FileDownloader.cxx
   trunk/libmnetutil/source/HttpFileSystem.cxx
   trunk/libmnetutil/source/StreamSocket.cxx
   trunk/libmutil/source/FileSystem.cxx
Log:

libmutil: 
 * Attempt of fixing Win32 compilation (use _mkdir(const char*) on W32).

libmnetutil:
 * FileDownloader compilation fails in MSVC because it does not know
   about the IPAddress class. We do not use IPAddress in this file.
   Via another header file we include StreamSocket.h which has
   an attribute that is an MRef to an IPAddress which I think causes
   this. I don't know why we need to know about IPAddress in
   FileDownloader, but my first guess is that it's because we have
   not specified any constructor for StreamSocket. This commit
   tries to fix the compilation by implementing (the empty) constructor
   in StreamSocket.
 * Removed "#warning" preprocessor directives not understood by MSVC
 



Modified: trunk/libmnetutil/include/libmnetutil/StreamSocket.h
===================================================================
--- trunk/libmnetutil/include/libmnetutil/StreamSocket.h	2007-11-23 00:07:32 UTC (rev 3513)
+++ trunk/libmnetutil/include/libmnetutil/StreamSocket.h	2007-11-23 12:36:29 UTC (rev 3514)
@@ -35,6 +35,7 @@
 
 class LIBMNETUTIL_API StreamSocket : public Socket {
 	public:
+		StreamSocket();
 		virtual ~StreamSocket();
 		virtual int32_t write(std::string)=0;
 		virtual int32_t write(const void *buf, int32_t count)=0;

Modified: trunk/libmnetutil/source/FileDownloader.cxx
===================================================================
--- trunk/libmnetutil/source/FileDownloader.cxx	2007-11-23 00:07:32 UTC (rev 3513)
+++ trunk/libmnetutil/source/FileDownloader.cxx	2007-11-23 12:36:29 UTC (rev 3514)
@@ -147,3 +147,4 @@
 		file.close();
 	}
 }
+

Modified: trunk/libmnetutil/source/HttpFileSystem.cxx
===================================================================
--- trunk/libmnetutil/source/HttpFileSystem.cxx	2007-11-23 00:07:32 UTC (rev 3513)
+++ trunk/libmnetutil/source/HttpFileSystem.cxx	2007-11-23 12:36:29 UTC (rev 3514)
@@ -63,8 +63,6 @@
 }
 
 void FileString::flush(){
-#warning FileString flush not implemented FIXME
-//	httpDl->uploadFile(myPath, data, len);
 }
 
 HttpFileSystem::HttpFileSystem(MRef<StreamSocket*> conn_, string prefix_) : 
@@ -79,9 +77,7 @@
 	int len=0;
 	HttpDownloader dl( "www.minisip.org/~erik/data.bin", conn );
 	data = dl.getChars(&len);
-#warning download data here FIXME;
 	return new FileString( data, len, conn);
-
 }
 
 

Modified: trunk/libmnetutil/source/StreamSocket.cxx
===================================================================
--- trunk/libmnetutil/source/StreamSocket.cxx	2007-11-23 00:07:32 UTC (rev 3513)
+++ trunk/libmnetutil/source/StreamSocket.cxx	2007-11-23 12:36:29 UTC (rev 3514)
@@ -29,6 +29,8 @@
 
 using namespace std;
 
+StreamSocket::StreamSocket(){}
+
 StreamSocket::~StreamSocket(){
 }
 

Modified: trunk/libmutil/source/FileSystem.cxx
===================================================================
--- trunk/libmutil/source/FileSystem.cxx	2007-11-23 00:07:32 UTC (rev 3513)
+++ trunk/libmutil/source/FileSystem.cxx	2007-11-23 12:36:29 UTC (rev 3514)
@@ -61,9 +61,16 @@
 }
 
 void LocalFileSystem::mkdir( const std::string & name ){
+#ifdef WIN32
+	if ( _mkdir( name.c_str() ) != 0 ){
+		throw FileSystemException("Could not create directory");
+	}
+
+#else
 	if ( ::mkdir( name.c_str(), 0 ) != 0 ){
 		throw FileSystemException("Could not create directory");
 	}
+#endif
 }
 
 MRef<File*> LocalFileSystem::open( const std::string & name, bool createIfNotExist ){