diff options
| author |  ridiculousfish <corydoras@ridiculousfish.com> | 2012-08-01 16:32:52 -0700 |
|---|---|---|
| committer | ridiculousfish <corydoras@ridiculousfish.com> | 2012-08-04 11:34:45 -0700 |
| commit | 8185bee4b83ce94f098cd07a360a0d78ad781c78 (patch) | |
| tree | 9d93c0c617de4c25e4acd49ff8383ce2a8d84e0c /builtin_commandline.cpp | |
| parent | 2e1b3325c63cd6c43a10a08acfc54d1fb29a5c03 (diff) | |
Lots of work towards making fish build without warnings on Mountain Lion, mostly in terms of using size_t instead of int
Diffstat (limited to 'builtin_commandline.cpp')
| -rw-r--r-- | builtin_commandline.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin_commandline.cpp b/builtin_commandline.cpp index b8d3868a..7c9cfd9a 100644 --- a/builtin_commandline.cpp +++ b/builtin_commandline.cpp @@ -127,7 +127,7 @@ static void replace_part( const wchar_t *begin, } } out.append( end ); - reader_set_buffer( out, (int)out_pos ); + reader_set_buffer( out, (size_t)out_pos ); } /** @@ -387,7 +387,7 @@ static int builtin_commandline( parser_t &parser, wchar_t **argv ) case 'I': current_buffer = woptarg; - current_cursor_pos = wcslen( woptarg ); + current_cursor_pos = (int)wcslen( woptarg ); break; case 'C': @@ -545,8 +545,8 @@ static int builtin_commandline( parser_t &parser, wchar_t **argv ) } current_buffer = reader_get_buffer(); - new_pos = maxi( 0L, mini( (long)new_pos, (long)wcslen( current_buffer ) ) ); - reader_set_buffer( current_buffer, new_pos ); + new_pos = maxi( 0L, mini( new_pos, (long)wcslen( current_buffer ) ) ); + reader_set_buffer( current_buffer, (size_t)new_pos ); return 0; } else |