Changeset 7542


Ignore:
Timestamp:
07/06/18 21:33:12 (2 weeks ago)
Author:
baker
Message:

Add -32 or -64 suffix to the EARTHWORM SYSTEM STATUS banner

Location:
trunk/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/libsrc/util/startstop_unix_generic.c

    r7075 r7542  
    1616  ********************************************************************/ 
    1717 
    18 #include <startstop_unix_generic.h> 
     18#include <ctype.h> 
    1919#include <inttypes.h> 
    20 #include <startstop_version.h> 
    21 #include <earthworm_complex_funcs.h> 
    22 #include <ew_nevent_message.h> 
    23 #include <ctype.h> 
     20#include <limits.h> 
    2421#include <signal.h> 
    2522#include <string.h> 
    2623#include <strings.h> 
     24 
     25#include "startstop_version.h" 
     26#include "startstop_unix_generic.h" 
     27#include "earthworm_complex_funcs.h" 
     28#include "ew_nevent_message.h" 
    2729 
    2830#define PROGRAM_NAME "startstop" 
     
    9698 
    9799   strcpy ( metaring.Version, STARTSTOP_VERSION ); 
    98    if (strlen(VERSION_APPEND_STR) > 0) {              /* if "64 bit" str then */ 
    99      strcat ( metaring.Version, VERSION_APPEND_STR ); /* add indicator string */ 
    100    } 
     100   strcat ( metaring.Version, VERSION_APPEND_STR ); /* add "64 bit" indicator string */ 
    101101/* Set name of configuration file 
    102102   ******************************/ 
     
    13001300      printf( "startstop/EncodeStatus: Error getting system information\n" ); 
    13011301 
    1302    sprintf( statusMsg, "                    EARTHWORM SYSTEM STATUS\n\n" ); 
     1302   sprintf( statusMsg, "                    EARTHWORM-%zu SYSTEM STATUS\n\n", 
     1303                       CHAR_BIT * sizeof( void * ) ); 
    13031304 
    13041305   sprintf( line, "        Hostname-OS:            %s - %s %s\n", 
  • trunk/src/libsrc/winnt/startstop_winlib.c

    r6803 r7542  
    33 ********************************************************************/ 
    44 
     5#include <limits.h> 
    56#include <stdio.h> 
    67#include <string.h> 
    78#include <windows.h> 
    8 #include <startstop_winlib.h> 
    9 #include <earthworm_complex_funcs.h> 
    10 #include <ew_nevent_message.h> 
    11 #include <pipeconsole.h> 
     9 
     10#include "startstop_winlib.h" 
     11#include "earthworm_complex_funcs.h" 
     12#include "ew_nevent_message.h" 
     13#include "pipeconsole.h" 
    1214 
    1315void StopChildThread( void* ); 
     
    539541   char *args[MAX_ARG], parg_line[100], field[3][20]; 
    540542 
    541    sprintf( statusMsg, "                    EARTHWORM SYSTEM STATUS\n\n" ); 
     543   sprintf( statusMsg, "                    EARTHWORM-%zu SYSTEM STATUS\n\n", 
     544                       CHAR_BIT * sizeof( void * ) ); 
    542545 
    543546   sprintf( line,    "        Start time (UTC):       %s", metaring->tstart ); 
  • trunk/src/system_control/startstop_nt/startstop.c

    r6803 r7542  
    4141   strcpy ( metaring.ConfigFile, DEF_CONFIG ); 
    4242   strcpy ( metaring.Version, STARTSTOP_VERSION ); 
    43    if (strlen(VERSION_APPEND_STR) > 0) {              /* if "64 bit" str then */ 
    44      strcat ( metaring.Version, VERSION_APPEND_STR ); /* add indicator string */ 
    45    } 
     43   strcat ( metaring.Version, VERSION_APPEND_STR ); /* add "64 bit" indicator string */ 
    4644   metaring.LogLocation = malloc( FILENAME_MAX + 1 ); 
    4745   memset(metaring.LogLocation, 0, FILENAME_MAX + 1); 
     
    271269  sleep_ew( 1000000 );      /* Sleep a long time; let main thread exit */ 
    272270} 
    273  
    274  
    275  
    276  
    277  
    278  
  • trunk/src/system_control/startstop_service/startstop_service.c

    r6803 r7542  
    1  
    21/* 
    32 *   THIS FILE IS UNDER RCS - DO NOT MODIFY UNLESS YOU HAVE 
     
    156155 */ 
    157156 
    158 #include <startstop_winlib.h> 
    159 #include <startstop_version.h> 
     157#include "startstop_version.h" 
     158#include "startstop_winlib.h" 
    160159 
    161160#define PROGRAM_NAME "startstop_service" 
     
    197196   strcpy ( metaring.ConfigFile, DEF_CONFIG ); 
    198197   strcpy ( metaring.Version, STARTSTOP_VERSION ); 
    199    if (strlen(VERSION_APPEND_STR) > 0) {              /* if "64 bit" str then */ 
    200      strcat ( metaring.Version, VERSION_APPEND_STR ); /* add indicator string */ 
    201    } 
     198   strcat ( metaring.Version, VERSION_APPEND_STR ); /* add "64 bit" indicator string */ 
    202199 
    203200   if ( argc == 2 ) 
     
    378375    } 
    379376} 
    380  
    381  
    382  
    383  
    384  
    385  
Note: See TracChangeset for help on using the changeset viewer.