h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-10 04:41:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Additional warning fixes and migration from int to size_t or long where appropriate

Browse Source
This commit is contained in:
ridiculousfish
2012-08-04 13:47:56 -07:00
parent 7a46227141
commit 54ceb4211e
7 changed files with 228 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
screen.cpp
View File

@@ -774,7 +774,7 @@ void s_write( screen_t *s,
size_t explicit_len,
const int *c,
const int *indent,
int cursor )
size_t cursor_pos )
{
int cursor_arr[2];
@@ -889,17 +889,17 @@ void s_write( screen_t *s,
prompt_width=0;
}
int i;
size_t i;
for( i=0; commandline[i]; i++ )
{
int col = c[i];
if( i == cursor )
if( i == cursor_pos )
{
col = 0;
}
if( i == cursor )
if( i == cursor_pos )
{
cursor_arr[0] = s->desired.cursor[0];
cursor_arr[1] = s->desired.cursor[1];
@@ -907,7 +907,7 @@ void s_write( screen_t *s,
s_desired_append_char( s, commandline[i], col, indent[i], prompt_width );
if( i== cursor && s->desired.cursor[1] != cursor_arr[1] && commandline[i] != L'\n' )
if( i== cursor_pos && s->desired.cursor[1] != cursor_arr[1] && commandline[i] != L'\n' )
{
/*
Ugh. We are placed exactly at the wrapping point of a
@@ -919,7 +919,7 @@ void s_write( screen_t *s,
cursor_arr[1] = s->desired.cursor[1];
}
}
if( i == cursor )
if( i == cursor_pos )
{
memcpy(cursor_arr, s->desired.cursor, sizeof(int)*2);
}