Changeset 1891 for trunk/source/cddrive.cpp

Timestamp:

03/27/08 12:40:50 (8 months ago)

Author:

peter

Message:

source/service.cpp
source/punch_fits.cpp
source/init_coreload.cpp
source/grains_mie.cpp
source/assert_results.cpp
source/parse_punch.cpp
source/optimize_phymir.cpp
source/version.h
source/parse_commands.cpp
source/prt_final.cpp
source/grid_do.cpp
source/parse_print.cpp
source/cddrive.cpp
source/prt_comment.cpp
tsuite/programs/mpi/mpi.cpp

• Bug-fix for PR59 - cdVersion, cdDate could cause segfault.
  
• Start preparing for the change of the release numbering scheme for the next release.
  

Files:

• trunk/source/cddrive.cpp (modified) (2 diffs)

trunk/source/cddrive.cpp

@@ -352 +352 @@
  *
  * cdVersion - puts version number of code into string 
- * incoming string must have at least 8 char and will become null
+ * incoming string must have sufficient length and will become null
  * terminated string
  *
  ************************************************************************/
 
-void cdVersion(char chString[] ) 
-{
-        DEBUG_ENTRY( "cdVersion()" );
-
-        if( !lgcdInitCalled )
-        {
-                printf(" cdInit was not called first - this must be the first call.\n");
-                cdEXIT(EXIT_FAILURE);
-        }
-
-        /* version was set by cdInit */
-        strcpy( chString , version.chVersion );
+void cdVersion(char chString[])
+{
+        strcpy( chString , version::Inst().chVersion );
         return;
 }
@@ -381 +372 @@
 
 /* cdDate - puts date of code into string  */
-void cdDate(char chString[] ) 
-{
-        /* date was set by cdInit */
-        strcpy( chString , version.chDate );
+void cdDate(char chString[])
+{
+        strcpy( chString , version::Inst().chDate );
         return;
 }