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

[walter at geodynamics.org]

Author: walter
Date: 2007-03-02 13:55:52 -0800 (Fri, 02 Mar 2007)
New Revision: 6163

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/StGermain/Base/IO/src/Journal.c
   long/3D/Gale/trunk/src/StGermain/Base/IO/src/Journal.h
Log:
 r1647 at earth:  boo | 2007-03-02 13:49:24 -0800
 Make the Journal commands take const char*.  This eliminates a number of warnings



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

Modified: long/3D/Gale/trunk/src/StGermain/Base/IO/src/Journal.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/IO/src/Journal.c	2007-03-02 19:58:42 UTC (rev 6162)
+++ long/3D/Gale/trunk/src/StGermain/Base/IO/src/Journal.c	2007-03-02 21:55:52 UTC (rev 6163)
@@ -522,7 +522,7 @@
 	Journal_Printf( stream, "\n" );
 }
 
-int Journal_Printf ( void* _stream, char* fmt, ... )
+int Journal_Printf ( void* _stream, const char* fmt, ... )
 {
 	int result;
 	Stream* stream = (Stream*)_stream;
@@ -543,7 +543,7 @@
 	return result;
 }
 
-int Journal_PrintfL( void* _stream, JournalLevel level, char* fmt, ... )
+int Journal_PrintfL( void* _stream, JournalLevel level, const char* fmt, ... )
 {
 	int result;
 	Stream* stream = (Stream*)_stream;
@@ -566,7 +566,7 @@
 int Journal_Firewall_Func( int expression, char* expressionText, 
 	const char* file, const char* func, int line, void* _stream, char* fmt, ... )
 */
-int Journal_Firewall( int expression, void* _stream, char* fmt, ... )
+int Journal_Firewall( int expression, void* _stream, const char* fmt, ... )
 {
 	int result = 0;
 	Stream* stream = (Stream*)_stream;

Modified: long/3D/Gale/trunk/src/StGermain/Base/IO/src/Journal.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/IO/src/Journal.h	2007-03-02 19:58:42 UTC (rev 6162)
+++ long/3D/Gale/trunk/src/StGermain/Base/IO/src/Journal.h	2007-03-02 21:55:52 UTC (rev 6163)
@@ -165,13 +165,13 @@
 
 
 	/** Performs a printf() with the given stream. */
-	int Journal_Printf( void* _stream, char* fmt, ... );
+	int Journal_Printf( void* _stream, const char* fmt, ... );
 
 	/** Performs a printf() with the given stream and level of printing.
 	 **
 	 ** Output is only produced if the stream's level of printing is equal or greater.
 	 **/
-	int Journal_PrintfL( void* _stream, JournalLevel level, char* fmt, ... );
+	int Journal_PrintfL( void* _stream, JournalLevel level, const char* fmt, ... );
 	
 	#ifdef DEBUG
 		/** Performs a Journal_Printf() only if DEBUG is defined. */
@@ -223,7 +223,7 @@
 	*/
 	
 	/* Temporary revert back to old protoype to avoid compilation issues. Need to fix. */
-	int Journal_Firewall( int expression, void* stream, char* fmt, ... );
+	int Journal_Firewall( int expression, void* stream, const char* fmt, ... );
 	
 	#ifdef DEBUG
 		/** Performs a Journal_Firewall() only if DEBUG is defined. */