Program: gdcm
Module: $RCSfile: gdcmUtil.cxx,v $
Language: C++
- Date: $Date: 2004/11/16 10:37:54 $
- Version: $Revision: 1.66 $
+ Date: $Date: 2004/12/13 15:12:33 $
+ Version: $Revision: 1.70 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include <stdarg.h> //only included in implementation file
#include <stdio.h> //only included in implementation file
-#if defined _MSC_VER || defined(__BORLANDC__)
+#if defined(_MSC_VER)
#include <winsock.h> // for gethostname & gethostbyname
#undef GetCurrentTime
#else
+#ifndef __BORLANDC__
#include <unistd.h> // for gethostname
#include <netdb.h> // for gethostbyname
#endif
+#endif
namespace gdcm
{
const std::string& subStr)
{
int count = 0; // counts how many times it appears
- unsigned int x = 0; // The index position in the string
+ std::string::size_type x = 0; // The index position in the string
do
{
{
std::string str = s;
- for(unsigned int i=0;i<str.size();i++)
+ for(unsigned int i=0; i<str.size(); i++)
{
- if(!isprint(str[i]))
+ if(!isprint((unsigned char)str[i]))
{
- str[i]='.';
+ str[i] = '.';
}
}
- if(str.size()>0)
+ if(str.size() > 0)
{
- if(!isprint(s[str.size()-1]))
+ if(!isprint((unsigned char)s[str.size()-1]))
{
- if(s[str.size()-1]==0)
+ if(s[str.size()-1] == 0)
{
- str[str.size()-1]=' ';
+ str[str.size()-1] = ' ';
}
}
}
# define HOST_NAME_MAX 255
// In this case we should maybe check the string was not truncated.
// But I don't known how to check that...
+#if defined(_MSC_VER) || defined(__BORLANDC__)
+ // with WinSock DLL we need to initialise the WinSock before using gethostname
+ WORD wVersionRequested = MAKEWORD(1,0);
+ WSADATA WSAData;
+ int err = WSAStartup(wVersionRequested,&WSAData);
+ if (err != 0) {
+ /* Tell the user that we could not find a usable */
+ /* WinSock DLL. */
+ WSACleanup();
+ return "127.0.0.1";
+ }
+#endif
+
#endif //HOST_NAME_MAX
std::string str;
(unsigned int)((unsigned char*)pHost->h_addr_list[i])[j]);
}
// str now contains one local IP address
+
+#if defined(_MSC_VER) || defined(__BORLANDC__)
+ WSACleanup();
+#endif
+
}
}
// If an error occur r == -1