Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-15 22:44:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use the new array_list functions in builtin_set.c

Browse source 
darcs-hash:20060731161719-ac50b-28a669e7a83f966dba3527a148ff0fa0813fbd6b.gz
This commit is contained in:
axel 2006-08-01 02:17:19 +10:00
parent cccd13db92
commit 9b95332aa9
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
builtin_set.c
View file

@ -233,7 +233,6 @@ static int parse_index( array_list_t *indexes,
{ {
wchar_t *end; wchar_t *end;
long l_ind = wcstol(src, &end, 10); long l_ind = wcstol(src, &end, 10);
int *ind;
if (end == src) if (end == src)
{ {
@ -246,9 +245,7 @@ static int parse_index( array_list_t *indexes,
l_ind = var_count+l_ind+1; l_ind = var_count+l_ind+1;
} }
ind = (int *) calloc(1, sizeof(int)); al_push_long(indexes, l_ind);
*ind = (int) l_ind;
al_push(indexes, ind);
src = end; src = end;
count++; count++;
while (iswspace(*src)) src++; while (iswspace(*src)) src++;
@ -275,7 +272,11 @@ static int update_values( array_list_t *list,
/* Replace values where needed */ /* Replace values where needed */
for( i = 0; i < al_get_count(indexes); i++ ) for( i = 0; i < al_get_count(indexes); i++ )
{ {
int ind = *(int *) al_get(indexes, i) - 1; /*
The '- 1' below is because the indices in fish are
one-based, but the array_lsit_t uses zero-based indices
*/
long ind = al_get_long(indexes, i) - 1;
void *new = (void *) al_get(values, i); void *new = (void *) al_get(values, i);
if( ind <= 0 ) if( ind <= 0 )
{ {
@ -291,18 +292,18 @@ static int update_values( array_list_t *list,
/** /**
Return 1 if an array list of int* pointers contains the specified Return 1 if an array list of longs contains the specified
value, 0 otherwise value, 0 otherwise
*/ */
static int al_contains_int( array_list_t *list, static int al_contains_long( array_list_t *list,
int val) long val)
{ {
int i; int i;
for (i = 0; i < al_get_count(list); i++) for (i = 0; i < al_get_count(list); i++)
{ {
int *current = (int *) al_get(list, i); long current = al_get_long(list, i);
if( current != 0 && *current == val ) if( current != 0 && current == val )
{ {
return 1; return 1;
} }
@ -324,7 +325,7 @@ static void erase_values(array_list_t *list, array_list_t *indexes)
for (i = 0; i < al_get_count(list); i++) for (i = 0; i < al_get_count(list); i++)
{ {
if (!al_contains_int(indexes, i + 1)) if (!al_contains_long(indexes, (long)i + 1))
{ {
al_push(&result, al_get(list, i)); al_push(&result, al_get(list, i));
} }
@ -749,7 +750,6 @@ static int builtin_set( wchar_t **argv )
al_foreach( &result, &free ); al_foreach( &result, &free );
al_destroy( &result ); al_destroy( &result );
al_foreach( &indexes, &free );
al_destroy(&indexes); al_destroy(&indexes);
al_destroy(&values); al_destroy(&values);