diff --git a/trick_sims/SIM_sun/RUN_test/input.py b/trick_sims/SIM_sun/RUN_test/input.py index 49357d86..fe1e64ed 100644 --- a/trick_sims/SIM_sun/RUN_test/input.py +++ b/trick_sims/SIM_sun/RUN_test/input.py @@ -101,7 +101,7 @@ if (os.path.isfile(SunDisplay_path)) : os.system( SunDisplay_cmd); else : print('==================================================================================') - print('SunDisplay needs to be built. Please \"cd\" into models/Graphics and type \"make\".') + print('SunDisplay needs to be built. Please \"cd\" into models/graphics and type \"make\".') print('==================================================================================') trick.stop(86400.0) diff --git a/trick_sims/SIM_sun/models/Sun/src/sun_pred_fast_display.c b/trick_sims/SIM_sun/models/Sun/src/sun_pred_fast_display.c index f8cee704..66722386 100644 --- a/trick_sims/SIM_sun/models/Sun/src/sun_pred_fast_display.c +++ b/trick_sims/SIM_sun/models/Sun/src/sun_pred_fast_display.c @@ -60,12 +60,12 @@ int sun_pred_fast_display( // sprintf(tmp_s," %ls %.6f",S->label_JD, S->JD); // strcat(message,tmp_s); if ( S->label_Azimuth != NULL ) { - sprintf(tmp_s," %ls %.3f%lc",S->label_Azimuth, S->solar_azimuth, DEGREE_SIGN); + sprintf(tmp_s," %ls %.3f%d",S->label_Azimuth, S->solar_azimuth, DEGREE_SIGN); } else { - sprintf(tmp_s," AZIMUTH %.3f%lc", S->solar_azimuth, DEGREE_SIGN); + sprintf(tmp_s," AZIMUTH %.3f%d", S->solar_azimuth, DEGREE_SIGN); } strcat(message,tmp_s); - sprintf(tmp_s," %ls %.3f%lc",S->label_Elevation, S->solar_elevation, DEGREE_SIGN); + sprintf(tmp_s," %ls %.3f%d",S->label_Elevation, S->solar_elevation, DEGREE_SIGN); strcat(message,tmp_s); send_hs(stdout,"%s\n",message); diff --git a/trick_source/data_products/Apps/trkConvert/CSV_Formatter.cpp b/trick_source/data_products/Apps/trkConvert/CSV_Formatter.cpp index 62d2b237..573dc855 100644 --- a/trick_source/data_products/Apps/trkConvert/CSV_Formatter.cpp +++ b/trick_source/data_products/Apps/trkConvert/CSV_Formatter.cpp @@ -17,8 +17,8 @@ void CSV_Formatter::writeDatum(FILE* out_fp, int16_t datum) { fprintf(out_fp,"% void CSV_Formatter::writeDatum(FILE* out_fp, uint16_t datum) { fprintf(out_fp,"%u", datum); } void CSV_Formatter::writeDatum(FILE* out_fp, int32_t datum) { fprintf(out_fp,"%d", datum); } void CSV_Formatter::writeDatum(FILE* out_fp, uint32_t datum) { fprintf(out_fp,"%u", datum); } -void CSV_Formatter::writeDatum(FILE* out_fp, int64_t datum) { fprintf(out_fp,"%lld", datum); } -void CSV_Formatter::writeDatum(FILE* out_fp, uint64_t datum) { fprintf(out_fp,"%lld", datum); } +void CSV_Formatter::writeDatum(FILE* out_fp, int64_t datum) { fprintf(out_fp,"%ld", datum); } +void CSV_Formatter::writeDatum(FILE* out_fp, uint64_t datum) { fprintf(out_fp,"%lu", datum); } void CSV_Formatter::writeDatum(FILE* out_fp, float datum) { fprintf(out_fp,"%.7f", datum); } void CSV_Formatter::writeDatum(FILE* out_fp, double datum) { fprintf(out_fp,"%.15g", datum); } const char* CSV_Formatter::extension() { return ".csv"; }; diff --git a/trick_source/data_products/DPX/APPS/GXPLOT/gp_utilities.cpp b/trick_source/data_products/DPX/APPS/GXPLOT/gp_utilities.cpp index b6a7a065..2672115d 100644 --- a/trick_source/data_products/DPX/APPS/GXPLOT/gp_utilities.cpp +++ b/trick_source/data_products/DPX/APPS/GXPLOT/gp_utilities.cpp @@ -57,7 +57,7 @@ int filterPostScriptColor( const char *psName, GPViewPageNode* gp_view_page_node string next_lt ; string new_buf_ptr ; string line_color ; - int red , blue , green ; + unsigned int red , blue , green ; int number_of_plots = (int)gp_view_page_node->plot_node_list.size(); //! Populate buf with file content. diff --git a/trick_source/sim_services/Executive/Executive_write_s_job_execution.cpp b/trick_source/sim_services/Executive/Executive_write_s_job_execution.cpp index f6cd0428..79bcc9ee 100644 --- a/trick_source/sim_services/Executive/Executive_write_s_job_execution.cpp +++ b/trick_source/sim_services/Executive/Executive_write_s_job_execution.cpp @@ -76,7 +76,7 @@ int Trick::Executive::write_s_job_execution(FILE *fp) { fprintf(fp, "\n===================================================================================================\n") ; fprintf(fp, "Scheduled Loop:\n\n") ; for ( ii = 0 ; ii < threads.size() ; ii++ ) { - fprintf(fp, "Thread %d:\n", ii) ; + fprintf(fp, "Thread %u:\n", ii) ; threads[ii]->job_queue.write_sched_queue(fp) ; fprintf(fp, "\n") ; } @@ -87,7 +87,7 @@ int Trick::Executive::write_s_job_execution(FILE *fp) { fprintf(fp, "Thread 0:\n"); top_of_frame_queue.write_sched_queue(fp) ; for ( ii = 1 ; ii < threads.size() ; ii++ ) { - fprintf(fp, "Thread %d:\n", ii) ; + fprintf(fp, "Thread %u:\n", ii) ; threads[ii]->top_of_frame_queue.write_sched_queue(fp) ; fprintf(fp, "\n") ; } @@ -98,7 +98,7 @@ int Trick::Executive::write_s_job_execution(FILE *fp) { fprintf(fp, "Thread 0:\n"); end_of_frame_queue.write_sched_queue(fp) ; for ( ii = 1 ; ii < threads.size() ; ii++ ) { - fprintf(fp, "Thread %d:\n", ii) ; + fprintf(fp, "Thread %u:\n", ii) ; threads[ii]->end_of_frame_queue.write_sched_queue(fp) ; fprintf(fp, "\n") ; } diff --git a/trick_source/sim_services/FrameLog/FrameLog.cpp b/trick_source/sim_services/FrameLog/FrameLog.cpp index 7ff87b6c..7893ca1d 100644 --- a/trick_source/sim_services/FrameLog/FrameLog.cpp +++ b/trick_source/sim_services/FrameLog/FrameLog.cpp @@ -782,7 +782,7 @@ int Trick::FrameLog::create_DP_job_files() { fprintf(fpx, " \n"); for ( ii = 0 ; ii < 8 and (page_count * 8 + ii + 1) < drg_users.size() ; ii++ ) { fprintf(fpx, " \n"); - fprintf(fpx, " Child thread %d Frame Scheduled Jobs\n", (page_count * 8 + ii + 1)); + fprintf(fpx, " Child thread %u Frame Scheduled Jobs\n", (page_count * 8 + ii + 1)); fprintf(fpx, " s \n"); fprintf(fpx, " \n"); fprintf(fpx, " \n"); diff --git a/trick_source/sim_services/InputProcessor/MTV.cpp b/trick_source/sim_services/InputProcessor/MTV.cpp index 560ecfb0..e2767c64 100644 --- a/trick_source/sim_services/InputProcessor/MTV.cpp +++ b/trick_source/sim_services/InputProcessor/MTV.cpp @@ -100,28 +100,28 @@ int Trick::MTV::send_event_data() { int jj; for (ii=0; ii < mtv_count; ii++) { - sprintf(varname, "%s[%d][0].name", mtv_name,ii); + sprintf(varname, "%s[%u][0].name", mtv_name,ii); var_add(varname); - sprintf(varname, "%s[%d][0].active", mtv_name,ii); + sprintf(varname, "%s[%u][0].active", mtv_name,ii); var_add(varname); - sprintf(varname, "%s[%d][0].added", mtv_name,ii); + sprintf(varname, "%s[%u][0].added", mtv_name,ii); var_add(varname); - sprintf(varname, "%s[%d][0].condition_count", mtv_name,ii); + sprintf(varname, "%s[%u][0].condition_count", mtv_name,ii); var_add(varname); - sprintf(varname, "%s[%d][0].action_count", mtv_name,ii); + sprintf(varname, "%s[%u][0].action_count", mtv_name,ii); var_add(varname); - sprintf(varname, "%s[%d][0].before_after", mtv_name,ii); + sprintf(varname, "%s[%u][0].before_after", mtv_name,ii); var_add(varname); for (jj=0; jj< mtv_list[ii]->condition_count; jj++) { - sprintf(varname, "%s[%d][0].cond[%d].comment", mtv_name,ii,jj); + sprintf(varname, "%s[%u][0].cond[%d].comment", mtv_name,ii,jj); var_add(varname); } for (jj=0; jj< mtv_list[ii]->action_count; jj++) { - sprintf(varname, "%s[%d][0].act[%d].comment", mtv_name,ii,jj); + sprintf(varname, "%s[%u][0].act[%d].comment", mtv_name,ii,jj); var_add(varname); } if (mtv_list[ii]->get_before_after() > 0) { - sprintf(varname, "%s[%d][0].target_name", mtv_name,ii); + sprintf(varname, "%s[%u][0].target_name", mtv_name,ii); var_add(varname); } } diff --git a/trick_source/sim_services/MonteCarlo/MonteVarFile.cpp b/trick_source/sim_services/MonteCarlo/MonteVarFile.cpp index b763926e..660e32fd 100644 --- a/trick_source/sim_services/MonteCarlo/MonteVarFile.cpp +++ b/trick_source/sim_services/MonteCarlo/MonteVarFile.cpp @@ -72,7 +72,7 @@ std::string Trick::MonteVarFile::get_next_value() { // Verify the input column number is valid. if ((column == 0) || (column > ntokens)) { char string[100]; - sprintf(string, "Trick:MonteVarFile An invalid column number %d, valid column numbers are 1 - %d", column, ntokens); + sprintf(string, "Trick:MonteVarFile An invalid column number %u, valid column numbers are 1 - %u", column, ntokens); exec_terminate_with_return(-1, __FILE__, __LINE__, string); } diff --git a/trick_source/sim_services/VariableServer/VariableServerThread_commands.cpp b/trick_source/sim_services/VariableServer/VariableServerThread_commands.cpp index b2dfe0f1..cb182d86 100644 --- a/trick_source/sim_services/VariableServer/VariableServerThread_commands.cpp +++ b/trick_source/sim_services/VariableServer/VariableServerThread_commands.cpp @@ -424,7 +424,7 @@ int Trick::VariableServerThread::transmit_file(std::string sie_file) { fseek(fp , 0L, SEEK_END) ; file_size = ftell(fp) ; - sprintf(buffer, "%d\t%d\n" , VS_SIE_RESOURCE, file_size) ; + sprintf(buffer, "%d\t%u\n" , VS_SIE_RESOURCE, file_size) ; tc_write(&connection , buffer , strlen(buffer)) ; rewind(fp) ;