Attachment 73834 Details for Bug 143551 – patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch

patch_143551.txt (text/plain), 42.27 KB, created by Igor Alelekov

on 2007-07-16 05:39:10 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Igor Alelekov

Created: 2007-07-16 05:39:10 EDT

Size: 42.27 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.platform.agentcontroller
>Index: src-native-new/src/transport/sharedMemTL/SharedMemListener.c
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/sharedMemTL/SharedMemListener.c,v
>retrieving revision 1.33
>diff -u -r1.33 SharedMemListener.c
>--- src-native-new/src/transport/sharedMemTL/SharedMemListener.c	6 Jun 2007 19:57:40 -0000	1.33
>+++ src-native-new/src/transport/sharedMemTL/SharedMemListener.c	16 Jul 2007 09:37:28 -0000
>@@ -417,7 +417,7 @@
> 	    rc =  ipcFlushToFunc(pMemBlockInfo, sharedMemMainDataProcessorFunc, (void *) pServerData) ;
>    	}
> 
>-	TPTP_LOG_DEBUG_MSG(pServerData, "Shared memory server ends...\n") ;
>+	TPTP_LOG_DEBUG_MSG(pServerData, "Shared memory server ends...") ;
> 
> 	destroyMem (pMemBlockInfo);
> 
>Index: src-native-new/src/transport/TPTPClientCompTL/CCTLServer.c
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/TPTPClientCompTL/CCTLServer.c,v
>retrieving revision 1.25
>diff -u -r1.25 CCTLServer.c
>--- src-native-new/src/transport/TPTPClientCompTL/CCTLServer.c	10 Jul 2007 18:24:48 -0000	1.25
>+++ src-native-new/src/transport/TPTPClientCompTL/CCTLServer.c	16 Jul 2007 09:37:27 -0000
>@@ -490,7 +490,7 @@
> 			convertIPAddressStringToArray(ipAddr, address);
> 
> 			if (!tptp_checkHost(cctlData->network_list, address)) {
>-				TPTP_LOG_ERROR_MSG2(stateData, "Connection refused on socket %d on host %s \n", clientSock, ipAddr);
>+				TPTP_LOG_ERROR_MSG2(stateData, "Connection refused on socket %d on host %s", clientSock, ipAddr);
> 				//printf("Connection refused on socket %d on host %s \n", clientSock, ipAddr);
> 				tptp_free(ipAddr);
> 				closeThisSocket(clientSock);
>Index: src-native-new/src/transport/TPTPClientCompTL/Connect2AC.c
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/TPTPClientCompTL/Connect2AC.c,v
>retrieving revision 1.69
>diff -u -r1.69 Connect2AC.c
>--- src-native-new/src/transport/TPTPClientCompTL/Connect2AC.c	5 Jun 2007 19:48:37 -0000	1.69
>+++ src-native-new/src/transport/TPTPClientCompTL/Connect2AC.c	16 Jul 2007 09:37:28 -0000
>@@ -1594,7 +1594,7 @@
> {
> 	tptp_int32 ret;
> 
>-	//TPTP_LOG_DEBUG_MSG3( stateData, "CCTL processing command (%s) from srcID %d, clientID %d\n",
>+	//TPTP_LOG_DEBUG_MSG3( stateData, "CCTL processing command (%s) from srcID %d, clientID %d",
> 	//	cmd, sourceID, ccb->clientID);
> 
> 	if ( isEqualString( interfaceID, "org.eclipse.tptp.agentManager" ) )
>Index: src-native-new/src/client/FileDataProcessor.cpp
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/client/FileDataProcessor.cpp,v
>retrieving revision 1.10
>diff -u -r1.10 FileDataProcessor.cpp
>--- src-native-new/src/client/FileDataProcessor.cpp	28 Oct 2005 19:48:50 -0000	1.10
>+++ src-native-new/src/client/FileDataProcessor.cpp	16 Jul 2007 09:37:27 -0000
>@@ -117,11 +117,11 @@
> 	rc = findFileRecordByName(fileName, &fileRec);
> 	if (rc != -1) {
> 		fwrite((void *)buffer, 1, length, fileRec.fp);
>-		TPTP_LOG_DEBUG_MSG1("Wrote %d bytes of data\n", length);
>-		//TPTP_LOG_DEBUG_MSG1("The data is - %s\n", buffer);
>+		TPTP_LOG_DEBUG_MSG1("Wrote %d bytes of data", length);
>+		//TPTP_LOG_DEBUG_MSG1("The data is - %s", buffer);
> 		/* Post the semaphore when we get to the last record */
> 		if (IS_DIME_END_RECORD(dimeHeader)) {
>-			TPTP_LOG_DEBUG_MSG("The end flag has arrived\n");
>+			TPTP_LOG_DEBUG_MSG("The end flag has arrived");
> 			tptp_postSemaphore(fileRec.semaphore);
> 		}
> 	}
>Index: src-native-new/src/client/ConnectionImpl.cpp
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/client/ConnectionImpl.cpp,v
>retrieving revision 1.26
>diff -u -r1.26 ConnectionImpl.cpp
>--- src-native-new/src/client/ConnectionImpl.cpp	6 Jun 2007 19:57:40 -0000	1.26
>+++ src-native-new/src/client/ConnectionImpl.cpp	16 Jul 2007 09:37:27 -0000
>@@ -747,7 +747,7 @@
> 		buffer = (unsigned char*)tptp_malloc( TPTP_DEFAULT_BUFFER_LENGTH+1 );
> 		if ( buffer == NULL )
> 		{
>-			TPTP_LOG_SEVERE_MSG1("Unable to allocate memory of size %d\n", TPTP_DEFAULT_BUFFER_LENGTH+1);
>+			TPTP_LOG_SEVERE_MSG1("Unable to allocate memory of size %d", TPTP_DEFAULT_BUFFER_LENGTH+1);
> 			return;
> 		}
> 
>Index: src-native-new/src/agentController/LoggingService.c
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/agentController/LoggingService.c,v
>retrieving revision 1.17
>diff -u -r1.17 LoggingService.c
>--- src-native-new/src/agentController/LoggingService.c	11 May 2006 18:22:51 -0000	1.17
>+++ src-native-new/src/agentController/LoggingService.c	16 Jul 2007 09:37:26 -0000
>@@ -132,6 +132,7 @@
> {
> 	tptp_string* cbeStr;
> 	tptp_int32   rc;
>+	int len;
> 
> 	if ( !ls->loggingEnabled )
> 	{
>@@ -144,6 +145,11 @@
> 		return 0;
> 	}
> 
>+	len = strlen(event);
>+	if (len > 0 && *(event + len - 1) == '\n') {
>+		*(event + len - 1) = '\0'; 
>+	} 
>+	
> 	if ( (ls->loggingFormat == TPTP_LOGFORMAT_CBE) && 
> 	     (0 == tptp_createLogCBE( "AgentController", subcomponent, instanceId, filename, lineNum, severity, event, &cbeStr )) )
> 	{
>Index: src-native-new/src/agentController/ConnectionManager.c
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/agentController/ConnectionManager.c,v
>retrieving revision 1.29
>diff -u -r1.29 ConnectionManager.c
>--- src-native-new/src/agentController/ConnectionManager.c	1 Nov 2006 22:47:16 -0000	1.29
>+++ src-native-new/src/agentController/ConnectionManager.c	16 Jul 2007 09:37:26 -0000
>@@ -181,13 +181,13 @@
> 		/* Only increment the ID if we were successful */
> 		cm->nextTransportID++;
> 
>-		TPTP_LOG_DEBUG_MSG1( cm, "Successfully loaded transport layer: %s\n", libName );
>+		TPTP_LOG_DEBUG_MSG1( cm, "Successfully loaded transport layer: %s", libName );
> 
> 		return 0;
> 	}
> 	else
> 	{
>-		TPTP_LOG_ERROR_MSG2( cm, "Unable to load transport layer: %s %s\n", libName, fullLibName );
>+		TPTP_LOG_ERROR_MSG2( cm, "Unable to load transport layer: %s %s", libName, fullLibName );
> 	}
> 
> 	return -1;
>@@ -325,7 +325,7 @@
> 
> 	/* Return the new connection ID */
> 	*connectionID = id;
>-	TPTP_LOG_DEBUG_MSG2(cm, "ConnectionManger - successfully added connectionID %d for transportID %d\n",*connectionID, transportID);
>+	TPTP_LOG_DEBUG_MSG2(cm, "ConnectionManger - successfully added connectionID %d for transportID %d",*connectionID, transportID);
> 
> 	/* Increment the next ID -- prototype */
> 	cm->nextConnectionID++;
>Index: src-native-new/src/agents/tptpProcessController/TPTPProcessController.cpp
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/agents/tptpProcessController/TPTPProcessController.cpp,v
>retrieving revision 1.71
>diff -u -r1.71 TPTPProcessController.cpp
>--- src-native-new/src/agents/tptpProcessController/TPTPProcessController.cpp	13 Jun 2007 03:23:26 -0000	1.71
>+++ src-native-new/src/agents/tptpProcessController/TPTPProcessController.cpp	16 Jul 2007 09:37:26 -0000
>@@ -231,7 +231,7 @@
> 	rc = sendCommand((char *)&cmd, cmdLength, CONNECT_CONSOLE);
> 	if (rc)
> 	{
>-		TPTP_LOG_ERROR_MSG(this, "PC: Error sending CONNECT_CONSOLE request to TL\n");
>+		TPTP_LOG_ERROR_MSG(this, "PC: Error sending CONNECT_CONSOLE request to TL");
> 		return rc;
> 	}
> 	
>@@ -658,7 +658,7 @@
> 	{
> 		// TODO: what should return value be on error?
> 		// Can't log this message to the AC since we don't have a valid instance ptr.
>-		//TPTP_LOG_ERROR_MSG("monitorProcessEvents Thread: Error - Invalid ProcessController handle\n");
>+		//TPTP_LOG_ERROR_MSG("monitorProcessEvents Thread: Error - Invalid ProcessController handle");
> 		return 0;
> 	}
> 
>@@ -1359,7 +1359,7 @@
> 	validApp = validateExecutable(appName, errCodeApp);
> 	validWorkingDir = validateDirectory(workingDir, errCodeDir);
> 
>-	TPTP_LOG_DEBUG_MSG2(this, "PC validateProcessToLaunch sending reply with validApp=%d, validWorkingDir=%d\n",
>+	TPTP_LOG_DEBUG_MSG2(this, "PC validateProcessToLaunch sending reply with validApp=%d, validWorkingDir=%d",
> 		validApp, validWorkingDir);
> 	//TODO: Need to return details about how the validation failed.
> 
>@@ -2341,7 +2341,7 @@
> 			{
> 				// Not an error - application aliases not required.
> 				// PC's appAliasesList just remains Null.
>-				TPTP_LOG_DEBUG_MSG(this, "PC processCommand: No Application aliases found by the Agent Controller\n");
>+				TPTP_LOG_DEBUG_MSG(this, "PC processCommand: No Application aliases found by the Agent Controller");
> 			} else
> 			{
> 				int tmpLAO;
>@@ -2349,7 +2349,7 @@
> 				// PC's appAliasesList.
> 				if (parseApplicationAliases(aliases, &appAliasesList, &tmpLAO))
> 				{
>-					TPTP_LOG_DEBUG_MSG(this, "PC processCommand: Failed to parse Application Alias list\n");
>+					TPTP_LOG_DEBUG_MSG(this, "PC processCommand: Failed to parse Application Alias list");
> 				}
> 
> 				if (tmpLAO)
>Index: src-native-new/src/shared/TPTPUtil/TPTPUtil.cpp
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/shared/TPTPUtil/TPTPUtil.cpp,v
>retrieving revision 1.35
>diff -u -r1.35 TPTPUtil.cpp
>--- src-native-new/src/shared/TPTPUtil/TPTPUtil.cpp	18 Apr 2007 17:44:37 -0000	1.35
>+++ src-native-new/src/shared/TPTPUtil/TPTPUtil.cpp	16 Jul 2007 09:37:27 -0000
>@@ -308,7 +308,7 @@
> 
> 		}
> 
>-		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing command string \"%s\"\n", (cmd?cmd:"null"));
>+		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing command string \"%s\"", (cmd?cmd:"null"));
> 		return -1;
> 	}
> 	catch (const XMLException& error)
>@@ -316,12 +316,12 @@
> 		char *errmesg = XMLString::transcode(error.getMessage());
> 		TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
> 		XMLString::release(&errmesg);
>-		TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing command string \"%s\"\n", (cmd?cmd:"null"));
>+		TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing command string \"%s\"", (cmd?cmd:"null"));
> 		return -1;
> 	}
> 	catch(...)
> 	{ 
>-		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing command string \"%s\"\n", (cmd?cmd:"null"));
>+		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing command string \"%s\"", (cmd?cmd:"null"));
> 		return -1;
> 	}
> }
>@@ -396,7 +396,7 @@
> 
> 		}
> 
>-		TPTP_LOG_PARSE_MSG2("XML/DOM Exception occurred while parsing \"%s\" attribute in command string \"%s\"\n", XML_ATTR_DEST, (cmd?cmd:"null"));
>+		TPTP_LOG_PARSE_MSG2("XML/DOM Exception occurred while parsing \"%s\" attribute in command string \"%s\"", XML_ATTR_DEST, (cmd?cmd:"null"));
> 		return -1;
> 	}
> 	catch (const XMLException& error)
>@@ -404,12 +404,12 @@
> 		char *errmesg = XMLString::transcode(error.getMessage());
> 		TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
> 		XMLString::release(&errmesg);
>-		TPTP_LOG_PARSE_MSG2("XML Exception occurred while parsing \"%s\" attribute in command string \"%s\"\n", XML_ATTR_DEST, (cmd?cmd:"null"));
>+		TPTP_LOG_PARSE_MSG2("XML Exception occurred while parsing \"%s\" attribute in command string \"%s\"", XML_ATTR_DEST, (cmd?cmd:"null"));
> 		return -1;
> 	}
> 	catch(...)
> 	{ 
>-		TPTP_LOG_PARSE_MSG2("Unexpected exception occurred while parsing \"%s\" attribute in command string \"%s\"\n", XML_ATTR_DEST, (cmd?cmd:"null"));
>+		TPTP_LOG_PARSE_MSG2("Unexpected exception occurred while parsing \"%s\" attribute in command string \"%s\"", XML_ATTR_DEST, (cmd?cmd:"null"));
> 		return -1;
> 	}
> }
>@@ -712,7 +712,7 @@
> 
> 		}
> 
>-		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing property list entry string \"%s\"\n", (property?property:"null"));
>+		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing property list entry string \"%s\"", (property?property:"null"));
> 		return -1;
> 	}
> 	catch (const XMLException& error)
>@@ -720,12 +720,12 @@
> 		char *errmesg = XMLString::transcode(error.getMessage());
> 		TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
> 		XMLString::release(&errmesg);
>-		TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing property list entry string \"%s\"\n", (property?property:"null"));
>+		TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing property list entry string \"%s\"", (property?property:"null"));
> 		return -1;
> 	}
> 	catch(...)
> 	{ 
>-		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing property list entry string \"%s\"\n", (property?property:"null"));
>+		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing property list entry string \"%s\"", (property?property:"null"));
> 		return -1;
> 	}
> }
>@@ -1349,7 +1349,7 @@
> 
> 		}
> 
>-		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while creating a cmd parameter list by parsing XML elements of a command string \"%s\"\n", (cmd?cmd:"null"));
>+		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while creating a cmd parameter list by parsing XML elements of a command string \"%s\"", (cmd?cmd:"null"));
> 		return -1;
> 	}
> 	catch (const XMLException& error)
>@@ -1357,12 +1357,12 @@
> 		char *errmesg = XMLString::transcode(error.getMessage());
> 		TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
> 		XMLString::release(&errmesg);
>-		TPTP_LOG_PARSE_MSG1("XML Exception occurred while creating a cmd parameter list by parsing XML elements of a command string \"%s\"\n", (cmd?cmd:"null"));
>+		TPTP_LOG_PARSE_MSG1("XML Exception occurred while creating a cmd parameter list by parsing XML elements of a command string \"%s\"", (cmd?cmd:"null"));
> 		return -1;
> 	}
> 	catch(...)
> 	{ 
>-		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while creating a cmd parameter list by parsing XML elements of a command string \"%s\"\n", (cmd?cmd:"null"));
>+		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while creating a cmd parameter list by parsing XML elements of a command string \"%s\"", (cmd?cmd:"null"));
> 		return -1;
> 	}
> }
>@@ -1504,7 +1504,7 @@
> 
> 		}
> 
>-		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing string value of an XML element in fragment \"%s\"\n", (fragment?fragment:"null"));
>+		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing string value of an XML element in fragment \"%s\"", (fragment?fragment:"null"));
> 		return -1;
> 	}
> 	catch (const XMLException& error)
>@@ -1512,12 +1512,12 @@
> 		char *errmesg = XMLString::transcode(error.getMessage());
> 		TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
> 		XMLString::release(&errmesg);
>-		TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing string value of an XML element in fragment \"%s\"\n", (fragment?fragment:"null"));
>+		TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing string value of an XML element in fragment \"%s\"", (fragment?fragment:"null"));
> 		return -1;
> 	}
> 	catch(...)
> 	{ 
>-		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing string value of an XML element in fragment \"%s\"\n", (fragment?fragment:"null"));
>+		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing string value of an XML element in fragment \"%s\"", (fragment?fragment:"null"));
> 		return -1;
> 	}
> }
>@@ -1889,7 +1889,7 @@
> 
> 		}
> 
>-		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing Host list in string \"%s\"\n", (initString?initString:"null"));
>+		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing Host list in string \"%s\"", (initString?initString:"null"));
> 		return -1;
> 	}
> 	catch (const XMLException& error)
>@@ -1897,12 +1897,12 @@
> 		char *errmesg = XMLString::transcode(error.getMessage());
> 		TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
> 		XMLString::release(&errmesg);
>-		TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing Host list in string \"%s\"\n", (initString?initString:"null"));
>+		TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing Host list in string \"%s\"", (initString?initString:"null"));
> 		return -1;
> 	}
> 	catch(...)
> 	{ 
>-		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing Host list in string \"%s\"\n", (initString?initString:"null"));
>+		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing Host list in string \"%s\"", (initString?initString:"null"));
> 		return -1;
> 	}
> }
>Index: src-native-new/src/shared/TPTPUtil/TPTPCmdUtil.c
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/shared/TPTPUtil/TPTPCmdUtil.c,v
>retrieving revision 1.3
>diff -u -r1.3 TPTPCmdUtil.c
>--- src-native-new/src/shared/TPTPUtil/TPTPCmdUtil.c	14 Nov 2006 22:40:25 -0000	1.3
>+++ src-native-new/src/shared/TPTPUtil/TPTPCmdUtil.c	16 Jul 2007 09:37:27 -0000
>@@ -75,7 +75,7 @@
> 	if ( cloneParam == NULL )
> 	{
> 		/* TODO: Report an internal error */
>-		//TPTP_LOG_ERROR_MSG("CmdUtil: Error - failed to alloc param obj\n");
>+		//TPTP_LOG_ERROR_MSG("CmdUtil: Error - failed to alloc param obj");
> 		return NULL;
> 	}
> 
>Index: src-native-new/src/transport/TPTPAgentCompTL/Connect2AC.c
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/TPTPAgentCompTL/Connect2AC.c,v
>retrieving revision 1.56
>diff -u -r1.56 Connect2AC.c
>--- src-native-new/src/transport/TPTPAgentCompTL/Connect2AC.c	5 Jun 2007 19:48:38 -0000	1.56
>+++ src-native-new/src/transport/TPTPAgentCompTL/Connect2AC.c	16 Jul 2007 09:37:27 -0000
>@@ -786,7 +786,7 @@
> {
> 	tptp_int32 ret;
> 
>-	TPTP_LOG_DEBUG_MSG3( stateData, "ACTL processing command (%s) from srcID %d, agent %s\n",
>+	TPTP_LOG_DEBUG_MSG3( stateData, "ACTL processing command (%s) from srcID %d, agent %s",
> 		cmdName, sourceID, agent->agentName.data);
> 
> 	/* Check the interface */
>Index: src-native-new/src/transport/TPTPAgentCompTL/AgentCmdHandlers.c
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/TPTPAgentCompTL/AgentCmdHandlers.c,v
>retrieving revision 1.24
>diff -u -r1.24 AgentCmdHandlers.c
>--- src-native-new/src/transport/TPTPAgentCompTL/AgentCmdHandlers.c	20 Jun 2007 13:19:01 -0000	1.24
>+++ src-native-new/src/transport/TPTPAgentCompTL/AgentCmdHandlers.c	16 Jul 2007 09:37:27 -0000
>@@ -373,7 +373,7 @@
> 			agent->logFile.length = 0;
> 		}
> 	} else {
>-		TPTP_LOG_INFO_MSG1(stateData, "Agent not found %s \n", agent->agentName.data);
>+		TPTP_LOG_INFO_MSG1(stateData, "Agent not found %s", agent->agentName.data);
> 		agent->IPCBufSize = 0;   /* 198757 */
> 		agent->clientMode=RA_DYNAMIC; /* 215066 */
> 		agent->logFile.data = NULL;
>Index: src-native-new/src/transport/transportSupport/TransportSupport.c
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/transportSupport/TransportSupport.c,v
>retrieving revision 1.16
>diff -u -r1.16 TransportSupport.c
>--- src-native-new/src/transport/transportSupport/TransportSupport.c	2 Nov 2006 18:58:08 -0000	1.16
>+++ src-native-new/src/transport/transportSupport/TransportSupport.c	16 Jul 2007 09:37:28 -0000
>@@ -135,19 +135,19 @@
> 
> 	if ((flags & CONNECT) != 0)
> 	{
>-		TPTP_LOG_DEBUG_MSG("CONNECTION REQUESTED COMMAND. \n") ;
>+		TPTP_LOG_DEBUG_MSG("CONNECTION REQUESTED COMMAND.") ;
> 		printTPTPCommand(pMsg, payLoadLength) ;
> 	}
> 
> 	else if ((flags & CONNECT_DATA) != 0)
> 	{
>-		TPTP_LOG_DEBUG_MSG("DATA CONNECTION REQUESTED COMMAND. \n") ;
>+		TPTP_LOG_DEBUG_MSG("DATA CONNECTION REQUESTED COMMAND.") ;
> 		printTPTPCommand_CONNECT_DATA(pMsg, payLoadLength) ;
> 	}
> 
> 	else if ((flags & DISCONNECT) != 0)
> 	{
>-		TPTP_LOG_DEBUG_MSG("DISCONNECT REQUESTED COMMAND. \n") ;
>+		TPTP_LOG_DEBUG_MSG("DISCONNECT REQUESTED COMMAND.") ;
> 	}
> 
> 	else if ((flags & CONNECTION_COMPLETE) != 0)
>@@ -159,7 +159,7 @@
> 		/* read in the connection id */
> 		readUINTFromBuffer(pBuffer, &connectionId);
> 
>-		TPTP_LOG_DEBUG_MSG1("CONNECTION COMPLETE RESPONSE. Connection ID (%d).\n", connectionId) ;
>+		TPTP_LOG_DEBUG_MSG1("CONNECTION COMPLETE RESPONSE. Connection ID (%d).", connectionId) ;
> 	}
> 
> 	else if (((flags & DATA_CONNECTION_COMPLETE) != 0) ||
>@@ -178,18 +178,18 @@
> 		{
> 			/* read in the uuid length */
> 			pBuffer = readUINTFromBuffer(pBuffer, &uuidLength);
>-			TPTP_LOG_DEBUG_MSG1("DATA CONNECTION COMPLETE RESPONSE. Connection ID (%d).\n", connectionId) ;
>+			TPTP_LOG_DEBUG_MSG1("DATA CONNECTION COMPLETE RESPONSE. Connection ID (%d).", connectionId) ;
> 		}
> 		else
> 		{
>-			TPTP_LOG_DEBUG_MSG1("CONSOLE CONNECTION COMPLETE RESPONSE. Connection ID (%d).\n", connectionId) ;
>+			TPTP_LOG_DEBUG_MSG1("CONSOLE CONNECTION COMPLETE RESPONSE. Connection ID (%d).", connectionId) ;
> 		}
> 
> 	}
> 
> 	else if ((flags & CONNECTION_REFUSED) != 0)
> 	{
>-		TPTP_LOG_DEBUG_MSG("CONNECTION REFUSED RESPONSE. \n") ;
>+		TPTP_LOG_DEBUG_MSG("CONNECTION REFUSED RESPONSE.") ;
> 	}
> 
> 	else
>@@ -220,7 +220,7 @@
> 		/* end with a NULL byte for using with printf */
> 		strncpy(copyCmd, pCmd, payLoadLength) ;
> 		copyCmd[payLoadLength] = '\0' ;
>-		TPTP_LOG_DEBUG_MSG1("COMMAND: %s. \n", copyCmd) ;
>+		TPTP_LOG_DEBUG_MSG1("COMMAND: %s.", copyCmd) ;
> 	}
> 
> 	return 0 ;
>@@ -265,7 +265,7 @@
> 			strcpy(copyCmd, "") ;
> 		}
> 
>-		TPTP_LOG_DEBUG_MSG2("COMMAND: dataPathType(%d) uid(%s). \n", 
>+		TPTP_LOG_DEBUG_MSG2("COMMAND: dataPathType(%d) uid(%s).", 
> 			dataPathType, copyCmd) ;
> 	}
> 
>Index: src-native-new/src/transport/transportSupport/TransportSupportNamedPipe_win.c
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/transportSupport/TransportSupportNamedPipe_win.c,v
>retrieving revision 1.20
>diff -u -r1.20 TransportSupportNamedPipe_win.c
>--- src-native-new/src/transport/transportSupport/TransportSupportNamedPipe_win.c	2 Nov 2006 18:58:08 -0000	1.20
>+++ src-native-new/src/transport/transportSupport/TransportSupportNamedPipe_win.c	16 Jul 2007 09:37:28 -0000
>@@ -307,7 +307,7 @@
> 	/* Build the full pipe name */
> 	sprintf(pFullName, "%s%s", pNameSpace, pPipeName) ;
> 
>-	TPTP_LOG_DEBUG_MSG2("Create pipe(%s) option(%d) \n", pFullName, createOption) ;
>+	TPTP_LOG_DEBUG_MSG2("Create pipe(%s) option(%d)", pFullName, createOption) ;
> 
> 	switch(createOption) 
> 	{
>@@ -380,7 +380,7 @@
> 	/* Build the pipe name for the platform */
> 	sprintf(pFullName, "%s%s", pNameSpace, pPipeName) ;
> 
>-	TPTP_LOG_DEBUG_MSG2("Open pipe(%s) option(%d) \n", pFullName, openOption) ;
>+	TPTP_LOG_DEBUG_MSG2("Open pipe(%s) option(%d)", pFullName, openOption) ;
> 
> 	switch(openOption) 
> 	{
>Index: src-native-new/src/transport/transportSupport/TransportSupportSharedMem.c
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/transportSupport/TransportSupportSharedMem.c,v
>retrieving revision 1.18
>diff -u -r1.18 TransportSupportSharedMem.c
>--- src-native-new/src/transport/transportSupport/TransportSupportSharedMem.c	6 Jun 2007 19:57:40 -0000	1.18
>+++ src-native-new/src/transport/transportSupport/TransportSupportSharedMem.c	16 Jul 2007 09:37:28 -0000
>@@ -346,7 +346,7 @@
> 		shmBufSize = requestedSize;
> 	}
> 
>-	TPTP_LOG_DEBUG_MSG("ipcMemCreate...\n") ;
>+	TPTP_LOG_DEBUG_MSG("ipcMemCreate...") ;
> 
> 	pShmHdl = (ra_shm_handle_t *) tptp_malloc(sizeof(ra_shm_handle_t)) ;
> 	if (pShmHdl == NULL) rc = -2 ;
>@@ -358,12 +358,12 @@
> 
> 		shmBufSize =  validateSystemShmMax(shmBufSize);
> 
>-		TPTP_LOG_DEBUG_MSG2("Shared mem name(%s) size(%d) \n", pMemName, shmBufSize) ;
>+		TPTP_LOG_DEBUG_MSG2("Shared mem name(%s) size(%d)", pMemName, shmBufSize) ;
> 		shmerr = ra_createShm((char*) pMemName, shmBufSize, pShmHdl) ;
> 
> 		if (shmerr != 0)
> 		{
>-			TPTP_LOG_ERROR_MSG1("Shared mem error(%d) \n", shmerr) ;
>+			TPTP_LOG_ERROR_MSG1("Shared mem error(%d)", shmerr) ;
> 			rc = -3 ;
> 		}
> 	}
>Index: src-native-new/src/transport/transportSupport/TransportSupportSharedMemExt.c
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/transportSupport/TransportSupportSharedMemExt.c,v
>retrieving revision 1.12
>diff -u -r1.12 TransportSupportSharedMemExt.c
>--- src-native-new/src/transport/transportSupport/TransportSupportSharedMemExt.c	31 May 2007 00:43:44 -0000	1.12
>+++ src-native-new/src/transport/transportSupport/TransportSupportSharedMemExt.c	16 Jul 2007 09:37:28 -0000
>@@ -55,12 +55,12 @@
> 			
> 	rc =  ra_attachToShm((char *) pMemName, & pShmHdl);
> 
>-	TPTP_LOG_DEBUG_MSG2("ipcMemOpen:  mem_name(%s) rc(%d) \n", pMemName, rc) ;
>+	TPTP_LOG_DEBUG_MSG2("ipcMemOpen:  mem_name(%s) rc(%d)", pMemName, rc) ;
> 
> 	if (rc == 0)
> 	{
> 		pBlockInfo->pRamboBlock = (LPVOID) pShmHdl ;
>-		TPTP_LOG_DEBUG_MSG2("ipcMemOpen:  block(%x) handle(%x) \n", pBlockInfo, pBlockInfo->pRamboBlock) ;
>+		TPTP_LOG_DEBUG_MSG2("ipcMemOpen:  block(%x) handle(%x)", pBlockInfo, pBlockInfo->pRamboBlock) ;
> 	}
> 
> 	return ( rc ) ;
>Index: src-native-new/src/transport/transportSupport/TransportSupportSocket.c
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/transport/transportSupport/TransportSupportSocket.c,v
>retrieving revision 1.22
>diff -u -r1.22 TransportSupportSocket.c
>--- src-native-new/src/transport/transportSupport/TransportSupportSocket.c	8 Mar 2007 16:30:58 -0000	1.22
>+++ src-native-new/src/transport/transportSupport/TransportSupportSocket.c	16 Jul 2007 09:37:28 -0000
>@@ -275,7 +275,7 @@
> 
> 	if (rc < 0)
> 	{
>-		TPTP_LOG_ERROR_MSG("Error: cannot bind to the socket. \n") ;
>+		TPTP_LOG_ERROR_MSG("Error: cannot bind to the socket.") ;
> 		//printCurrentSysError() ;
> 	}
> 	else
>@@ -285,7 +285,7 @@
> 		result = setHandleInherited((HANDLE)sock) ;
> 		if ( result == 0 )
> 		{
>-			TPTP_LOG_ERROR_MSG("Error: unable to set handle info. \n") ;
>+			TPTP_LOG_ERROR_MSG("Error: unable to set handle info.") ;
> 			rc = - 1;
> 		}
> 		else
>@@ -293,7 +293,7 @@
> 			rc = listen(sock, 100) ;
> 			if (rc < 0)
> 			{
>-				TPTP_LOG_ERROR_MSG("Error: unable to listen. \n") ;
>+				TPTP_LOG_ERROR_MSG("Error: unable to listen.") ;
> 			}
> 		}
> 	}
>@@ -345,7 +345,7 @@
> 	int    enable=1;
> 	struct linger linger;
> 
>-	TPTP_LOG_DEBUG_MSG("Ready to accept next socket connection request...\n") ;
>+	TPTP_LOG_DEBUG_MSG("Ready to accept next socket connection request...") ;
> 
>     clientSock = accept(serverSock, (struct sockaddr * ) & clientAddress, (int *)&clientLen);  
> 
>@@ -353,11 +353,11 @@
> 
> 	if ( rc == 0 )
> 	{
>-		TPTP_LOG_ERROR_MSG("Error: unable to accept connection.\n") ;
>+		TPTP_LOG_ERROR_MSG("Error: unable to accept connection.") ;
> 	}
> 	else
> 	{
>-		TPTP_LOG_DEBUG_MSG("Accept new socket connection request.\n");
>+		TPTP_LOG_DEBUG_MSG("Accept new socket connection request.");
> 	}
> 
> 
>@@ -407,7 +407,7 @@
> 	struct linger linger;
> 	int    loopcnt = 0 ;
> 
>-	TPTP_LOG_DEBUG_MSG("connectToTCPServer...\n") ;
>+	TPTP_LOG_DEBUG_MSG("connectToTCPServer...") ;
> 
> 	sock = socket(PF_INET, SOCK_STREAM, 0);
> 
>Index: src-native-new/src/CmdExtractor/MsgParser.cpp
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/CmdExtractor/MsgParser.cpp,v
>retrieving revision 1.23
>diff -u -r1.23 MsgParser.cpp
>--- src-native-new/src/CmdExtractor/MsgParser.cpp	18 Apr 2007 17:44:38 -0000	1.23
>+++ src-native-new/src/CmdExtractor/MsgParser.cpp	16 Jul 2007 09:37:26 -0000
>@@ -132,7 +132,7 @@
> 
> 		}
> 
>-		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing Cmd in message \"%s\"\n", (msg?msg:"null"));
>+		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing Cmd in message \"%s\"", (msg?msg:"null"));
> 		return -1;
> 	}
> 	catch (const XMLException& error)
>@@ -140,12 +140,12 @@
> 		char *errmesg = XMLString::transcode(error.getMessage());
> 		TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
> 		XMLString::release(&errmesg);
>-		TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing Cmd in message \"%s\"\n", (msg?msg:"null"));
>+		TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing Cmd in message \"%s\"", (msg?msg:"null"));
> 		return -1;
> 	}
> 	catch(...)
> 	{ 
>-		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing Cmd in message \"%s\"\n", (msg?msg:"null"));
>+		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing Cmd in message \"%s\"", (msg?msg:"null"));
> 		return -1;
> 	}
> }
>Index: src-native-new/src/shared/processControlUtil/ProcessControlUtil.c
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/shared/processControlUtil/ProcessControlUtil.c,v
>retrieving revision 1.42
>diff -u -r1.42 ProcessControlUtil.c
>--- src-native-new/src/shared/processControlUtil/ProcessControlUtil.c	8 Sep 2006 20:19:29 -0000	1.42
>+++ src-native-new/src/shared/processControlUtil/ProcessControlUtil.c	16 Jul 2007 09:37:27 -0000
>@@ -92,7 +92,7 @@
> 	if ( cloneLstnr == NULL )
> 	{
> 		/* TODO: Report an internal error */
>-		TPTP_LOG_ERROR_MSG("ProcessControlUtil: Error - failed to alloc listener obj\n");
>+		TPTP_LOG_ERROR_MSG("ProcessControlUtil: Error - failed to alloc listener obj");
> 		return NULL;
> 	}
> 
>@@ -279,7 +279,7 @@
> 	if ( cloneProc == NULL )
> 	{
> 		/* TODO: Report an internal error */
>-		TPTP_LOG_ERROR_MSG("ProcessControlUtil: Error - failed to alloc proc obj\n");
>+		TPTP_LOG_ERROR_MSG("ProcessControlUtil: Error - failed to alloc proc obj");
> 		return NULL;
> 	}
> 
>@@ -362,7 +362,7 @@
> 	if ( cloneProc->monitors == NULL )
> 	{
> 		/* TODO: Report an internal error */
>-		TPTP_LOG_ERROR_MSG("ProcessControlUtil: Error - failed to alloc listener obj\n");
>+		TPTP_LOG_ERROR_MSG("ProcessControlUtil: Error - failed to alloc listener obj");
> 		return NULL;
> 	}
> 	tptp_list_clone(cloneProc->monitors, proc->monitors);
>@@ -513,7 +513,7 @@
> 		if (STAT(dir, &statBuf) != 0)  //Does it exist?
> 		{
> 			//perror("PCUTil");
>-			TPTP_LOG_DEBUG_MSG1("PCUtil: Invalid dir=%s\n", dir);
>+			TPTP_LOG_DEBUG_MSG1("PCUtil: Invalid dir=%s", dir);
> 			*errCode = TPTP_PC_DIR_NOT_FOUND;
> 			return validDir;
> 		}
>@@ -535,7 +535,7 @@
> 	{
> 		//Null argument
> 		*errCode = TPTP_UNEXPECTED_NULL_ARG;
>-		TPTP_LOG_DEBUG_MSG("PCUtil: Error - Arg dir is a NULL value\n");
>+		TPTP_LOG_DEBUG_MSG("PCUtil: Error - Arg dir is a NULL value");
> 	}
> 
> 	return validDir;
>@@ -557,7 +557,7 @@
> 		if (STAT(dir, &statBuf) != 0)  //Does it exist?
> 		{
> 			//perror("PCUTil");
>-			TPTP_LOG_DEBUG_MSG1("PCUtil: Invalid dir=%s\n", dir);
>+			TPTP_LOG_DEBUG_MSG1("PCUtil: Invalid dir=%s", dir);
> 			*errCode = TPTP_PC_DIR_NOT_FOUND;
> 			return validDir;
> 		}
>@@ -579,7 +579,7 @@
> 	{
> 		//Null argument
> 		*errCode = TPTP_UNEXPECTED_NULL_ARG;
>-		TPTP_LOG_DEBUG_MSG("PCUtil: Error - Arg dir is a NULL value\n");
>+		TPTP_LOG_DEBUG_MSG("PCUtil: Error - Arg dir is a NULL value");
> 	}
> 
> 	return validDir;
>@@ -606,7 +606,7 @@
> 
> 	TPTP_HANDLE consoleChild[3];
> 
>-	TPTP_LOG_DEBUG_MSG1("createProc: Called on to create process: %s\n", proc->appName);
>+	TPTP_LOG_DEBUG_MSG1("createProc: Called on to create process: %s", proc->appName);
> 
> 	// If given a non-null console pointer, then pass the handles to the process we are creating
> 	if (console)
>@@ -640,7 +640,7 @@
> 
> 	// Successfully launched the application, fillin tptp_process_t struct
> 	// which is returned to the caller.
>-	TPTP_LOG_DEBUG_MSG1("createProc: SUCCESSFULLY created process: %lu\n", (unsigned long)proc->pid);
>+	TPTP_LOG_DEBUG_MSG1("createProc: SUCCESSFULLY created process: %lu", (unsigned long)proc->pid);
> 	*errCode = 0;
> 
> #ifdef _WIN32		
>@@ -649,7 +649,7 @@
> 	proc->hProcess = OpenProcess(PROCESS_ALL_ACCESS, FALSE, proc->pid);
> 	if (proc->hProcess == 0)
> 	{
>-		TPTP_LOG_DEBUG_MSG("OpenProcess() call failed. \n");
>+		TPTP_LOG_DEBUG_MSG("OpenProcess() call failed.");
> 		//printCurrentSysError();
> 		*errCode = TPTP_PC_OPEN_PROC_FAILED;
> 		return -1;
>Index: src-native-new/src/agents/agentBase/DataProviderImpl.cpp
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/agents/agentBase/DataProviderImpl.cpp,v
>retrieving revision 1.34
>diff -u -r1.34 DataProviderImpl.cpp
>--- src-native-new/src/agents/agentBase/DataProviderImpl.cpp	13 Apr 2007 16:00:20 -0000	1.34
>+++ src-native-new/src/agents/agentBase/DataProviderImpl.cpp	16 Jul 2007 09:37:26 -0000
>@@ -139,13 +139,13 @@
> 
> 	DataProviderImpl * pProvider = (DataProviderImpl *) dataConn->pObj ;
> 
>-//	TPTP_LOG_DEBUG_MSG1(this, "Agent: establishDataPath() receives %d bytes \n", dataLen) ;
>+//	TPTP_LOG_DEBUG_MSG1(this, "Agent: establishDataPath() receives %d bytes", dataLen) ;
> 
> 	ipcCloseMem(&dataConn->agentMemBlockInfo);
> 
> 	if (dataConn->_isEstablished == false)
> 	{
>-		// TPTP_LOG_DEBUG_MSG(this, "---> SharedMemDataPathProcessorFunc calls doEstablish() \n") ;
>+		// TPTP_LOG_DEBUG_MSG(this, "---> SharedMemDataPathProcessorFunc calls doEstablish()") ;
> 
> 		pProvider->doEstablish((char *) pData, dataLen, dataConn) ;
> 		//TODO: Can't say it is truly established at this point since we've not
>@@ -157,7 +157,7 @@
> 	}
> 	else
> 	{
>-		// TPTP_LOG_DEBUG_MSG(this, "---> SharedMemDataPathProcessorFunc calls receiveData() \n") ;
>+		// TPTP_LOG_DEBUG_MSG(this, "---> SharedMemDataPathProcessorFunc calls receiveData()") ;
> 		pProvider->processData(dataConn->clientid, (char*)pData, 0, dataLen);
> 		//pProvider->receiveData(dataConn->clientid, (char*)pData, dataLen);
> 	}
>Index: src-native-new/src/shared/tptpConfig/TPTPConfig.cpp
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/src/shared/tptpConfig/TPTPConfig.cpp,v
>retrieving revision 1.60
>diff -u -r1.60 TPTPConfig.cpp
>--- src-native-new/src/shared/tptpConfig/TPTPConfig.cpp	9 May 2007 19:10:32 -0000	1.60
>+++ src-native-new/src/shared/tptpConfig/TPTPConfig.cpp	16 Jul 2007 09:37:27 -0000
>@@ -1499,7 +1499,7 @@
> 
> 		}
> 
>-		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing plugin config file \"%s\"\n", (XMLfilename?XMLfilename:"null"));
>+		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing plugin config file \"%s\"", (XMLfilename?XMLfilename:"null"));
> 		return -1;
> 	}
> 	catch (const XMLException& error)
>@@ -1507,12 +1507,12 @@
> 		char *errmesg = XMLString::transcode(error.getMessage());
> 		TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
> 		XMLString::release(&errmesg);
>-		TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing plugin config file \"%s\"\n", (XMLfilename?XMLfilename:"null"));
>+		TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing plugin config file \"%s\"", (XMLfilename?XMLfilename:"null"));
> 		return -1;
> 	}
> 	catch(...)
> 	{ 
>-		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing plugin config file \"%s\"\n", (XMLfilename?XMLfilename:"null"));
>+		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing plugin config file \"%s\"", (XMLfilename?XMLfilename:"null"));
> 		return -1;
> 	}
> }
>@@ -1942,7 +1942,7 @@
> 
> 		}
> 
>-		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing AC config file \"%s\"\n", (acConfigFile?acConfigFile:"null"));
>+		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing AC config file \"%s\"", (acConfigFile?acConfigFile:"null"));
> 		return -1;
> 	}
> 	catch (const XMLException& error)
>@@ -1950,12 +1950,12 @@
> 		char *errmesg = XMLString::transcode(error.getMessage());
> 		TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
> 		XMLString::release(&errmesg);
>-		printf("XML Exception occurred while parsing AC config file \"%s\"\n", (acConfigFile?acConfigFile:"null"));
>+		printf("XML Exception occurred while parsing AC config file \"%s\"", (acConfigFile?acConfigFile:"null"));
> 		return -1;
> 	}
> 	catch(...)
> 	{ 
>-		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing AC config file \"%s\"\n", (acConfigFile?acConfigFile:"null"));
>+		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing AC config file \"%s\"", (acConfigFile?acConfigFile:"null"));
> 		return -1;
> 	}
> }
>@@ -2295,7 +2295,7 @@
> 
> 		}
> 
>-		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing agent metadata in file \"%s\"\n", (agentConfigFileName?agentConfigFileName:"null"));
>+		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing agent metadata in file \"%s\"", (agentConfigFileName?agentConfigFileName:"null"));
> 		return -1;
> 	}
> 	catch (const XMLException& error)
>@@ -2303,12 +2303,12 @@
> 		char *errmesg = XMLString::transcode(error.getMessage());
> 		TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
> 		XMLString::release(&errmesg);
>-		TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing agent metadata in file \"%s\"\n", (agentConfigFileName?agentConfigFileName:"null"));
>+		TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing agent metadata in file \"%s\"", (agentConfigFileName?agentConfigFileName:"null"));
> 		return -1;
> 	}
> 	catch(...)
> 	{ 
>-		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing agent metadata in file \"%s\"\n", (agentConfigFileName?agentConfigFileName:"null"));
>+		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing agent metadata in file \"%s\"", (agentConfigFileName?agentConfigFileName:"null"));
> 		return -1;
> 	}
> }
>@@ -2683,7 +2683,7 @@
> 
> 		}
> 
>-		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing Application string \"%s\"\n", (applicationString?applicationString:"null"));
>+		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing Application string \"%s\"", (applicationString?applicationString:"null"));
> 		return -1;
> 	}
> 	catch (const XMLException& error)
>@@ -2691,12 +2691,12 @@
> 		char *errmesg = XMLString::transcode(error.getMessage());
> 		TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
> 		XMLString::release(&errmesg);
>-		TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing Application string \"%s\"\n", (applicationString?applicationString:"null"));
>+		TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing Application string \"%s\"", (applicationString?applicationString:"null"));
> 		return -1;
> 	}
> 	catch(...)
> 	{ 
>-		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing Application string \"%s\"\n", (applicationString?applicationString:"null"));
>+		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing Application string \"%s\"", (applicationString?applicationString:"null"));
> 		return -1;
> 	}
> }
>@@ -3038,7 +3038,7 @@
> 
> 		}
> 
>-		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing ApplicationAliases string \"%s\"\n", (applicationString?applicationString:"null"));
>+		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing ApplicationAliases string \"%s\"", (applicationString?applicationString:"null"));
> 		return -1;
> 	}
> 	catch (const XMLException& error)
>@@ -3046,12 +3046,12 @@
> 		char *errmesg = XMLString::transcode(error.getMessage());
> 		TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
> 		XMLString::release(&errmesg);
>-		TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing ApplicationAliases string \"%s\"\n", (applicationString?applicationString:"null"));
>+		TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing ApplicationAliases string \"%s\"", (applicationString?applicationString:"null"));
> 		return -1;
> 	}
> 	catch(...)
> 	{ 
>-		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing ApplicationAliases string \"%s\"\n", (applicationString?applicationString:"null"));
>+		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing ApplicationAliases string \"%s\"", (applicationString?applicationString:"null"));
> 		return -1;
> 	}
> }
>@@ -3714,8 +3714,8 @@
> 						strcpy(customData->name, gchnodename);
> 						customData->value = temp;
> 						tptp_list_add(&agentCustomDataList, (void *)customData);
>-						TPTP_LOG_DEBUG_MSG1(pAgent, "Custom Node Name - %s\n", customData->name);
>-						TPTP_LOG_DEBUG_MSG1(pAgent, "Custom Node Value - %s\n", customData->value);
>+						TPTP_LOG_DEBUG_MSG1(pAgent, "Custom Node Name - %s", customData->name);
>+						TPTP_LOG_DEBUG_MSG1(pAgent, "Custom Node Value - %s", customData->value);
> 					
> 						XMLString::release(&gchnodename);
> 					}
>@@ -3750,7 +3750,7 @@
> 
> 		}
> 
>-		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing AgentConfig file \"%s\"\n", (agentConfigFileName?agentConfigFileName:"null"));
>+		TPTP_LOG_PARSE_MSG1("XML/DOM Exception occurred while parsing AgentConfig file \"%s\"", (agentConfigFileName?agentConfigFileName:"null"));
> 		return -1;
> 	}
> 	catch (const XMLException& error)
>@@ -3758,12 +3758,12 @@
> 		char *errmesg = XMLString::transcode(error.getMessage());
> 		TPTP_LOG_PARSE_MSG2("XML Exception: %s (at line %d)", errmesg, error.getSrcLine());
> 		XMLString::release(&errmesg);
>-		TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing AgentConfig file \"%s\"\n", (agentConfigFileName?agentConfigFileName:"null"));
>+		TPTP_LOG_PARSE_MSG1("XML Exception occurred while parsing AgentConfig file \"%s\"", (agentConfigFileName?agentConfigFileName:"null"));
> 		return -1;
> 	}
> 	catch(...)
> 	{ 
>-		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing AgentConfig file \"%s\"\n", (agentConfigFileName?agentConfigFileName:"null"));
>+		TPTP_LOG_PARSE_MSG1("Unexpected exception occurred while parsing AgentConfig file \"%s\"", (agentConfigFileName?agentConfigFileName:"null"));
> 		return -1;
> 	}
> }*/

Actions: View | Diff

Attachments on bug 143551: 42459 | 73834