h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-21 11:31:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Removed buffer_t

Browse Source
This commit is contained in:
ridiculousfish
2012-03-04 02:45:51 -08:00
parent 191221eec5
commit 2c5001a5b3
4 changed files with 20 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
fish_pager.cpp
View File

@@ -1113,16 +1113,13 @@ static void destroy()
*/
static void read_array( FILE* file, wcstring_list_t &comp )
{
buffer_t buffer;
std::vector<char> buffer;
int c;
char cc;
wchar_t *wcs;
b_init( &buffer );
while( !feof( file ) )
{
buffer.used=0;
buffer.clear();
while( 1 )
{
@@ -1137,17 +1134,14 @@ static void read_array( FILE* file, wcstring_list_t &comp )
break;
}
cc=c;
b_append( &buffer, &cc, 1 );
buffer.push_back(static_cast<char>(c));
}
if( buffer.used )
if( ! buffer.empty() )
{
cc=0;
b_append( &buffer, &cc, 1 );
buffer.push_back(0);
wcs = str2wcs( buffer.buff );
wcs = str2wcs( &buffer.at(0) );
if( wcs )
{
wcstring tmp = wcs;
@@ -1160,8 +1154,6 @@ static void read_array( FILE* file, wcstring_list_t &comp )
}
}
b_destroy( &buffer );
}
static int get_fd( const char *str )