mirror of
https://github.com/fish-shell/fish-shell.git
synced 2024-11-22 20:47:44 +08:00
Minor code fixes
darcs-hash:20061019153950-ac50b-9a7d5939ce47cd5f8b7167a97b0e9c62315b7b6e.gz
This commit is contained in:
parent
4683f4c989
commit
45f1263112
|
@ -1440,7 +1440,7 @@ static int builtin_random( wchar_t **argv )
|
|||
}
|
||||
lrand48_r( &seed_buffer, &res );
|
||||
|
||||
sb_printf( sb_out, L"%d\n", res%32767 );
|
||||
sb_printf( sb_out, L"%d\n", abs(res%32767) );
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
4
common.c
4
common.c
|
@ -408,13 +408,13 @@ wchar_t **strv2wcsv( const char **in )
|
|||
|
||||
}
|
||||
|
||||
wchar_t *wcsvarname( wchar_t *str )
|
||||
wchar_t *wcsvarname( const wchar_t *str )
|
||||
{
|
||||
while( *str )
|
||||
{
|
||||
if( (!iswalnum(*str)) && (*str != L'_' ) )
|
||||
{
|
||||
return str;
|
||||
return (wchar_t *)str;
|
||||
}
|
||||
str++;
|
||||
}
|
||||
|
|
3
common.h
3
common.h
|
@ -207,7 +207,8 @@ __sentinel wchar_t *wcsdupcat2( const wchar_t *a, ... );
|
|||
\return null if this is a valid name, and a pointer to the first invalid character otherwise
|
||||
*/
|
||||
|
||||
wchar_t *wcsvarname( wchar_t *str );
|
||||
wchar_t *wcsvarname( const wchar_t *str );
|
||||
|
||||
|
||||
/**
|
||||
Test if the given string is valid in a variable name
|
||||
|
|
|
@ -126,7 +126,7 @@ static int get_names_show_exported;
|
|||
static int get_names_show_unexported;
|
||||
|
||||
|
||||
wchar_t *utf2wcs( char *in )
|
||||
wchar_t *utf2wcs( const char *in )
|
||||
{
|
||||
iconv_t cd=(iconv_t) -1;
|
||||
int i,j;
|
||||
|
@ -185,7 +185,7 @@ wchar_t *utf2wcs( char *in )
|
|||
}
|
||||
|
||||
|
||||
nconv = iconv( cd, &in, &in_len, &nout, &out_len );
|
||||
nconv = iconv( cd, (char **)&in, &in_len, &nout, &out_len );
|
||||
|
||||
if (nconv == (size_t) -1)
|
||||
{
|
||||
|
@ -201,7 +201,7 @@ wchar_t *utf2wcs( char *in )
|
|||
return out;
|
||||
}
|
||||
|
||||
char *wcs2utf( wchar_t *in )
|
||||
char *wcs2utf( const wchar_t *in )
|
||||
{
|
||||
iconv_t cd=(iconv_t) -1;
|
||||
int i,j;
|
||||
|
|
|
@ -50,7 +50,7 @@ typedef char tputs_arg_t;
|
|||
#endif
|
||||
|
||||
#ifndef SIGWINCH
|
||||
#define SIGIO SIGUSR2
|
||||
#define SIGWINCH SIGUSR2
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_WINSIZE
|
||||
|
|
Loading…
Reference in New Issue
Block a user