History

update long/t_CKINT mismatches; address windows 64-bit warnings

Ge Wang committed 4 years ago

Commit bd96b1b1 parent 72e554b24 files · +189 −176Browse files

Showing the changes to src/core/chuck_shell.cpp (1 of 24 files). Show all

Unified · Split

src/core/chuck_shell.cpp+7−7
@@ -564,7 +564,7 @@ void Chuck_Shell::continue_code( string & in ) · 563 unmodified lines
564564 #ifndef __PLATFORM_WIN32__
565565 snprintf( buf, 16, "code %2d> ", (int)scope );
566566 #else
567− sprintf( buf, "code %2d> ", scope);
567+ sprintf( buf, "code %2ld> ", (long)scope);
568568 #endif
569569 prompt = buf;
570570 }
@@ -577,7 +577,7 @@ void Chuck_Shell::continue_code( string & in ) · 6 unmodified lines
577577 #ifndef __PLATFORM_WIN32__
578578 snprintf( buf, 16, "code %2d> ", (int)scope );
579579 #else
580− sprintf( buf, "code %2d> ", scope);
580+ sprintf( buf, "code %2ld> ", (long)scope);
581581 #endif
582582 prompt = buf;
583583 }
@@ -1421,7 +1421,7 @@ t_CKINT Chuck_Shell::Command_Ls::execute( vector< string > & argv, · 837 unmodified lines
14211421
14221422 if( argv.size() == 0 )
14231423 {
1424− DWORD i, k = 64;
1424+ t_CKUINT i, k = 64;
14251425 LPTSTR cwd = new char [k];
14261426 WIN32_FIND_DATA find_data;
14271427
@@ -1450,12 +1450,12 @@ t_CKINT Chuck_Shell::Command_Ls::execute( vector< string > & argv, · 22 unmodified lines
14501450 return 0;
14511451 }
14521452
1453− int i, len = argv.size();
1453+ t_CKINT i, len = argv.size();
14541454 t_CKBOOL print_parent_name = len > 1 ? TRUE : FALSE;
14551455
14561456 for( i = 0; i < len; i++ )
14571457 {
1458− int j = argv[i].size() + 3;
1458+ t_CKINT j = argv[i].size() + 3;
14591459 WIN32_FIND_DATA find_data;
14601460 LPTSTR dir = new char [j];
14611461 strncpy( dir, argv[i].c_str(), j );
@@ -1889,7 +1889,7 @@ t_CKINT Chuck_Shell::Command_VMAdd::execute( vector< string > & argv, · 427 unmodified lines
18891889 #ifndef __PLATFORM_WIN32__
18901890 snprintf( buf, 16, "%lu", caller->vms.size() - 1 );
18911891 #else
1892− sprintf( buf, "%u", caller->vms.size() - 1 );
1892+ sprintf( buf, "%lu", (long)caller->vms.size() - 1 );
18931893 #endif // __PLATFORM_WIN32__
18941894
18951895 out += caller->current_vm->fullname() + " saved as VM " + buf + "\n";
@@ -1987,7 +1987,7 @@ t_CKINT Chuck_Shell::Command_VMList::execute( vector< string > & argv, · 91 unmodified lines
19871987 #ifndef __PLATFORM_WIN32__
19881988 snprintf( buf, 16, "%lu", i );
19891989 #else
1990− sprintf( buf, "%lu", i );
1990+ sprintf( buf, "%lu", (long)i );
19911991 #endif // __PLATFORM_WIN32__
19921992 out += string( "VM " ) + buf + ": " +
19931993 caller->vms[i]->fullname() + "\n";

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t