You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by pr...@apache.org on 2006/03/21 18:06:38 UTC

svn commit: r387583 - in /webservices/axis/trunk/c/src/configuration: FileFunctions.cpp FileFunctions.hpp MissingCFunctions.cpp MissingCFunctions.hpp

Author: prestonf
Date: Tue Mar 21 09:06:36 2006
New Revision: 387583

URL: http://svn.apache.org/viewcvs?rev=387583&view=rev
Log:
Completed Client code except for WSDD configuration.

Modified:
    webservices/axis/trunk/c/src/configuration/FileFunctions.cpp
    webservices/axis/trunk/c/src/configuration/FileFunctions.hpp
    webservices/axis/trunk/c/src/configuration/MissingCFunctions.cpp
    webservices/axis/trunk/c/src/configuration/MissingCFunctions.hpp

Modified: webservices/axis/trunk/c/src/configuration/FileFunctions.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/configuration/FileFunctions.cpp?rev=387583&r1=387582&r2=387583&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/configuration/FileFunctions.cpp (original)
+++ webservices/axis/trunk/c/src/configuration/FileFunctions.cpp Tue Mar 21 09:06:36 2006
@@ -153,27 +153,9 @@
 			if( lFileLength < 5)
 			{
 				char		szConfigData[512];
-#if WIN32
-#if defined(_MSC_VER) && _MSC_VER >= 1300	// Start MSVC verison number > 7.0
-				__time64_t	ltime;
 
-				_time64( &ltime);
+				sprintf( szConfigData, "# This header file was created by AxisConfiguration on %s", TimeNow());
 
-				sprintf( szConfigData, "# This header file was created by AxisConfiguration on %s", _ctime64( &ltime));
-#else										// Else !(MSVC verison number > 7.0)
-				time_t sTimeNow;
-
-			    sTimeNow = time( NULL);
-
-				sprintf( szConfigData, "# This header file was created by AxisConfiguration on %s", asctime( localtime( &sTimeNow)));
-#endif										// End MSVC verison number
-#else
-				time_t sTimeNow;
-
-			    sTimeNow = time( NULL);
-
-				sprintf( szConfigData, "# This header file was created by AxisConfiguration on %s", asctime( localtime( &sTimeNow)));
-#endif
 				WriteLineToFile( pFile, szConfigData);
 
 				WriteLineToFile( pFile, "# The comment character is '#'\n");
@@ -283,27 +265,7 @@
 		FILE *		pFile = fopen( szFilename, "w");
 		char		szConfigData[512];
 
-#if WIN32
-#if defined(_MSC_VER) && _MSC_VER >= 1300	// Start MSVC verison number > 7.0
-				__time64_t	ltime;
-
-				_time64( &ltime);
-
-				sprintf( szConfigData, "# This header file was created by AxisConfiguration on %s", _ctime64( &ltime));
-#else										// Else !(MSVC verison number > 7.0)
-				time_t sTimeNow;
-
-			    sTimeNow = time( NULL);
-
-				sprintf( szConfigData, "# This header file was created by AxisConfiguration on %s", asctime( localtime( &sTimeNow)));
-#endif										// End MSVC verison number
-#else
-		time_t sTimeNow;
-
-		sTimeNow = time( NULL);
-
-		sprintf( szConfigData, "# This header file was created by AxisConfiguration on %s", asctime( localtime( &sTimeNow)));
-#endif
+		sprintf( szConfigData, "# This header file was created by AxisConfiguration on %s", TimeNow());
 
 		WriteLineToFile( pFile, szConfigData);
 
@@ -352,27 +314,8 @@
 		{
 			long		lFileLength = GetFileLength( pFileFrom);
 			char		szBackupHeader[256];
-#if WIN32
-#if defined(_MSC_VER) && _MSC_VER >= 1300	// Start MSVC verison number > 7.0
-			__time64_t	ltime;
-
-			_time64( &ltime);
-
-			sprintf( szBackupHeader, "# This header file was automatically backed up by AxisConfiguration on %s", _ctime64( &ltime));
-#else										// Else !(MSVC verison number > 7.0)
-			time_t sTimeNow;
-
-		    sTimeNow = time( NULL);
-
-			sprintf( szBackupHeader, "# This header file was automatically backed up by AxisConfiguration on %s", asctime( localtime( &sTimeNow)));
-#endif										// End MSVC verison number
-#else
-			time_t	sTimeNow;
-
-			sTimeNow = time( NULL);
 
-			sprintf( szBackupHeader, "# This header file was automatically backed up by AxisConfiguration on %s", asctime( localtime( &sTimeNow)));
-#endif
+			sprintf( szBackupHeader, "# This header file was automatically backed up by AxisConfiguration on %s", TimeNow());
 
 			char *	pFileContent = (char *) malloc( lFileLength + strlen( szBackupHeader) + 2);
 

Modified: webservices/axis/trunk/c/src/configuration/FileFunctions.hpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/configuration/FileFunctions.hpp?rev=387583&r1=387582&r2=387583&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/configuration/FileFunctions.hpp (original)
+++ webservices/axis/trunk/c/src/configuration/FileFunctions.hpp Tue Mar 21 09:06:36 2006
@@ -7,7 +7,6 @@
 #endif
 
 #include "AxisConfiguration.hpp"
-#include <time.h>
 
 bool ReadFilenamesInaDirectory( char * pszDirName, LIST * psFileNameList);
 void WriteAxisConfigFile( LIST * psDLLNames, int * piConfigInfoArray, CHOICELIST * psChoiceList, bool bMerge, char * pszAxisCpp_Deploy, char cSlash);

Modified: webservices/axis/trunk/c/src/configuration/MissingCFunctions.cpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/configuration/MissingCFunctions.cpp?rev=387583&r1=387582&r2=387583&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/configuration/MissingCFunctions.cpp (original)
+++ webservices/axis/trunk/c/src/configuration/MissingCFunctions.cpp Tue Mar 21 09:06:36 2006
@@ -47,3 +47,27 @@
 	}
 }
 
+char * TimeNow()
+{
+#if WIN32
+#if defined(_MSC_VER) && _MSC_VER >= 1300	// Start MSVC verison number > 7.0
+	__time64_t	ltime;
+
+	_time64( &ltime);
+
+	return _ctime64( &ltime);
+#else										// Else !(MSVC verison number > 7.0)
+	time_t sTimeNow;
+
+    sTimeNow = time( NULL);
+
+	return asctime( localtime( &sTimeNow));
+#endif										// End MSVC verison number
+#else
+	time_t	sTimeNow;
+
+	sTimeNow = time( NULL);
+
+	return asctime( localtime( &sTimeNow));
+#endif
+}

Modified: webservices/axis/trunk/c/src/configuration/MissingCFunctions.hpp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/src/configuration/MissingCFunctions.hpp?rev=387583&r1=387582&r2=387583&view=diff
==============================================================================
--- webservices/axis/trunk/c/src/configuration/MissingCFunctions.hpp (original)
+++ webservices/axis/trunk/c/src/configuration/MissingCFunctions.hpp Tue Mar 21 09:06:36 2006
@@ -1,4 +1,6 @@
 #include "AxisConfiguration.hpp"
+#include <time.h>
 
 bool StringCompare( char * pszString1, char * pszString2);
 void StringToUpper( char * pszString);
+char * TimeNow();