Changeset 1891 for trunk/source/prt_final.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/prt_final.cpp (modified) (3 diffs)

trunk/source/prt_final.cpp

@@ -136 +136 @@
 
         /* print name and version number */
-        /*lint -e666 expression with side effects */
         fprintf( ioQQQ, "\f\n");
-        REPEAT_16( fprintf( ioQQQ, " "); )
-        REPEAT_4( fprintf( ioQQQ, " "); )
-        REPEAT_2( fprintf( ioQQQ, " ");)
-        fprintf( ioQQQ, " "); 
-        for(i=0; i<31; ++i )
-                fprintf( ioQQQ, "*");
-        fprintf( ioQQQ, "*"); 
-        fprintf( ioQQQ, "> Cloudy %s <", version.chVersion);
-        for(i=0; i<32; ++i )
-                fprintf( ioQQQ, "*");
+        fprintf( ioQQQ, "%23c", ' ' );
+        int len = strlen(version::Inst().chVersion);
+        int repeat = (72-len)/2;
+        for( i=0; i < repeat; ++i )
+                fprintf( ioQQQ, "*" );
+        fprintf( ioQQQ, "> Cloudy %s <", version::Inst().chVersion );
+        for( i=0; i < 72-repeat-len; ++i )
+                fprintf( ioQQQ, "*" );
         fprintf( ioQQQ, "\n" );
-        /*lint +e666 */
 
         for( i=0; i <= input.nSave; i++ )
@@ -165 +161 @@
                 /* >>chng 04 jan 21, add hide option */
                 if( (strcmp(chCKey,"CONT")!= 0) && !nMatch( "HIDE" , input.chCARDCAPS) )
-                {
-                        /* print leading space and first * */
-                        fprintf( ioQQQ, "                       * ");
-
-                        j = 0;
-                        /* print actual command */
-                        while( input.chCardSav[i][j] !='\0' )
-                        {
-                                fprintf( ioQQQ, "%c", input.chCardSav[i][j] );
-                                ++j;
-                        }
-
-                        /* flush out rest of space then * */
-                        while( j<80 )
-                        {
-                                fprintf( ioQQQ, "%c", ' ' );
-                                ++j;
-                        }
-                        /* end the line */
-                        fprintf( ioQQQ, "*\n" );
-                }
+                        fprintf( ioQQQ, "%23c* %-80s*\n", ' ', input.chCardSav[i] );
         }
 
@@ -202 +178 @@
           a );
 
-        if( version.nBetaVer > 0 )
+        if( version::Inst().nBetaVer > 0 )
         {
                 fprintf( ioQQQ,