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
564#ifndef __PLATFORM_WIN32__564#ifndef __PLATFORM_WIN32__
565 snprintf( buf, 16, "code %2d> ", (int)scope );565 snprintf( buf, 16, "code %2d> ", (int)scope );
566#else566#else
567 sprintf( buf, "code %2d> ", scope);567 sprintf( buf, "code %2ld> ", (long)scope);
568#endif568#endif
569 prompt = buf;569 prompt = buf;
570 }570 }
@@ -577,7 +577,7 @@ void Chuck_Shell::continue_code( string & in ) · 6 unmodified lines
577#ifndef __PLATFORM_WIN32__577#ifndef __PLATFORM_WIN32__
578 snprintf( buf, 16, "code %2d> ", (int)scope );578 snprintf( buf, 16, "code %2d> ", (int)scope );
579#else579#else
580 sprintf( buf, "code %2d> ", scope);580 sprintf( buf, "code %2ld> ", (long)scope);
581#endif581#endif
582 prompt = buf;582 prompt = buf;
583 }583 }
@@ -1421,7 +1421,7 @@ t_CKINT Chuck_Shell::Command_Ls::execute( vector< string > & argv, · 837 unmodified lines
1421 1421
1422 if( argv.size() == 0 )1422 if( argv.size() == 0 )
1423 {1423 {
1424 DWORD i, k = 64;1424 t_CKUINT i, k = 64;
1425 LPTSTR cwd = new char [k];1425 LPTSTR cwd = new char [k];
1426 WIN32_FIND_DATA find_data;1426 WIN32_FIND_DATA find_data;
1427 1427
@@ -1450,12 +1450,12 @@ t_CKINT Chuck_Shell::Command_Ls::execute( vector< string > & argv, · 22 unmodified lines
1450 return 0;1450 return 0;
1451 }1451 }
1452 1452
1453 int i, len = argv.size();1453 t_CKINT i, len = argv.size();
1454 t_CKBOOL print_parent_name = len > 1 ? TRUE : FALSE;1454 t_CKBOOL print_parent_name = len > 1 ? TRUE : FALSE;
1455 1455
1456 for( i = 0; i < len; i++ )1456 for( i = 0; i < len; i++ )
1457 {1457 {
1458 int j = argv[i].size() + 3;1458 t_CKINT j = argv[i].size() + 3;
1459 WIN32_FIND_DATA find_data;1459 WIN32_FIND_DATA find_data;
1460 LPTSTR dir = new char [j];1460 LPTSTR dir = new char [j];
1461 strncpy( dir, argv[i].c_str(), j );1461 strncpy( dir, argv[i].c_str(), j );
@@ -1889,7 +1889,7 @@ t_CKINT Chuck_Shell::Command_VMAdd::execute( vector< string > & argv, · 427 unmodified lines
1889#ifndef __PLATFORM_WIN32__1889#ifndef __PLATFORM_WIN32__
1890 snprintf( buf, 16, "%lu", caller->vms.size() - 1 );1890 snprintf( buf, 16, "%lu", caller->vms.size() - 1 );
1891#else1891#else
1892 sprintf( buf, "%u", caller->vms.size() - 1 ); 1892 sprintf( buf, "%lu", (long)caller->vms.size() - 1 );
1893#endif // __PLATFORM_WIN32__1893#endif // __PLATFORM_WIN32__
1894 1894
1895 out += caller->current_vm->fullname() + " saved as VM " + buf + "\n";1895 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
1987#ifndef __PLATFORM_WIN32__1987#ifndef __PLATFORM_WIN32__
1988 snprintf( buf, 16, "%lu", i );1988 snprintf( buf, 16, "%lu", i );
1989#else1989#else
1990 sprintf( buf, "%lu", i );1990 sprintf( buf, "%lu", (long)i );
1991#endif // __PLATFORM_WIN32__1991#endif // __PLATFORM_WIN32__
1992 out += string( "VM " ) + buf + ": " + 1992 out += string( "VM " ) + buf + ": " +
1993 caller->vms[i]->fullname() + "\n";1993 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