[cig-commits] r7694 - in long/3D/Gale/trunk: . src/StGermain/Base/IO/src

[walter at geodynamics.org]

Author: walter
Date: 2007-07-18 11:37:13 -0700 (Wed, 18 Jul 2007)
New Revision: 7694

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/StGermain/Base/IO/src/LineFormatter.c
   long/3D/Gale/trunk/src/StGermain/Base/IO/src/LineFormatter.h
   long/3D/Gale/trunk/src/StGermain/Base/IO/src/Stream.c
   long/3D/Gale/trunk/src/StGermain/Base/IO/src/Stream.h
   long/3D/Gale/trunk/src/StGermain/Base/IO/src/StreamFormatter.c
   long/3D/Gale/trunk/src/StGermain/Base/IO/src/StreamFormatter.h
Log:
 r1878 at earth:  boo | 2007-07-18 11:31:10 -0700
 Clean up some compiler warnings related to output



Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
   - 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1876
   + 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1878

Modified: long/3D/Gale/trunk/src/StGermain/Base/IO/src/LineFormatter.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/IO/src/LineFormatter.c	2007-07-18 17:22:54 UTC (rev 7693)
+++ long/3D/Gale/trunk/src/StGermain/Base/IO/src/LineFormatter.c	2007-07-18 18:37:13 UTC (rev 7694)
@@ -127,7 +127,7 @@
 	return newLineFormatter;
 }
 
-char* _LineFormatter_Format( void* formatter, char* fmt )
+char* _LineFormatter_Format( void* formatter, const char* fmt )
 {
 	LineFormatter* self = (LineFormatter*)formatter;
 	char* result;
@@ -147,8 +147,10 @@
 
 	if ( self->_tag == NULL )
 	{
+          result = StreamFormatter_Buffer_AllocNext( strlen(fmt));
+          strcpy(result,fmt);
 		/* No tag to add, so return same format */
-		return fmt;
+		return result;
 	}
 
 	/* count number of inserts */

Modified: long/3D/Gale/trunk/src/StGermain/Base/IO/src/LineFormatter.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/IO/src/LineFormatter.h	2007-07-18 17:22:54 UTC (rev 7693)
+++ long/3D/Gale/trunk/src/StGermain/Base/IO/src/LineFormatter.h	2007-07-18 18:37:13 UTC (rev 7694)
@@ -89,7 +89,7 @@
 
 
 	/** Formats a output string of printf by prepending a tag in front of every line detected. */
-	char* _LineFormatter_Format( void* formatter, char* fmt );
+	char* _LineFormatter_Format( void* formatter, const char* fmt );
 
 
 #endif /* __Base_IO_LineFormatter_h__ */

Modified: long/3D/Gale/trunk/src/StGermain/Base/IO/src/Stream.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/IO/src/Stream.c	2007-07-18 17:22:54 UTC (rev 7693)
+++ long/3D/Gale/trunk/src/StGermain/Base/IO/src/Stream.c	2007-07-18 18:37:13 UTC (rev 7694)
@@ -266,7 +266,7 @@
 }
 
 
-SizeT Stream_Printf( Stream *stream, char *fmt, va_list args )
+SizeT Stream_Printf( Stream *stream, const char *fmt, va_list args )
 {
 	int i;
 	SizeT result;

Modified: long/3D/Gale/trunk/src/StGermain/Base/IO/src/Stream.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/IO/src/Stream.h	2007-07-18 17:22:54 UTC (rev 7693)
+++ long/3D/Gale/trunk/src/StGermain/Base/IO/src/Stream.h	2007-07-18 18:37:13 UTC (rev 7694)
@@ -124,7 +124,7 @@
 	void* _Stream_Copy( void* stream, void* dest, Bool deep, Name nameExt, struct PtrMap* ptrMap );
 	
 	/** Performs a printf() on the given stream. */
-	SizeT Stream_Printf( Stream* stream, char* fmt, va_list args );
+	SizeT Stream_Printf( Stream* stream, const char* fmt, va_list args );
 
 	/** Performs a write() on the given stream. */
 	SizeT Stream_Write( Stream* stream, void* data, SizeT elem_size, SizeT num_elems );

Modified: long/3D/Gale/trunk/src/StGermain/Base/IO/src/StreamFormatter.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/IO/src/StreamFormatter.c	2007-07-18 17:22:54 UTC (rev 7693)
+++ long/3D/Gale/trunk/src/StGermain/Base/IO/src/StreamFormatter.c	2007-07-18 18:37:13 UTC (rev 7694)
@@ -114,7 +114,7 @@
 }
 
 
-char* StreamFormatter_Format( void* formatter, char* fmt )
+char* StreamFormatter_Format( void* formatter, const char* fmt )
 {
 	StreamFormatter* self = (StreamFormatter*)formatter;
 	return self->_format( self, fmt );

Modified: long/3D/Gale/trunk/src/StGermain/Base/IO/src/StreamFormatter.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/IO/src/StreamFormatter.h	2007-07-18 17:22:54 UTC (rev 7693)
+++ long/3D/Gale/trunk/src/StGermain/Base/IO/src/StreamFormatter.h	2007-07-18 18:37:13 UTC (rev 7694)
@@ -49,7 +49,7 @@
 	/** Textual name for StreamFormatter class. */
 	extern const Type StreamFormatter_Type;
 
-	typedef char* (StreamFormatter_FormatFunction) ( void* formatter, char* fmt );
+	typedef char* (StreamFormatter_FormatFunction) ( void* formatter, const char* fmt );
 
 	/** \def __StreamFormatter See StreamFormatter */
 	#define __StreamFormatter \
@@ -88,7 +88,7 @@
 
 
 	/** Formats a Printf() output string. */
-	char* StreamFormatter_Format( void* formatter, char* fmt );
+	char* StreamFormatter_Format( void* formatter, const char* fmt );
 
 
 	extern StreamFormatter_Buffer* stgStreamFormatter_Buffer;