aboutsummaryrefslogtreecommitdiffhomepage
path: root/fish_tests.cpp
diff options
context:
space:
mode:
authorGravatar ridiculousfish <corydoras@ridiculousfish.com>2012-03-03 22:48:21 -0800
committerGravatar ridiculousfish <corydoras@ridiculousfish.com>2012-03-03 22:48:21 -0800
commit087940ec9ee6ee8f989eac49453ebe6be761fa6b (patch)
treeb5c1f9bf1d1ceb7eee929f20b787c766d4a86d50 /fish_tests.cpp
parent8a46931e3426b724f8502cb77f4a6787e5294c40 (diff)
Fix a bug where wfopen would always fail
Removed some buffer_t
Diffstat (limited to 'fish_tests.cpp')
-rw-r--r--fish_tests.cpp16
1 files changed, 7 insertions, 9 deletions
diff --git a/fish_tests.cpp b/fish_tests.cpp
index 1cc986d5..31761924 100644
--- a/fish_tests.cpp
+++ b/fish_tests.cpp
@@ -228,30 +228,28 @@ static void test_convert()
int i;
- buffer_t sb;
+ std::vector<char> sb;
say( L"Testing wide/narrow string conversion" );
-
- b_init( &sb );
for( i=0; i<ESCAPE_TEST_COUNT; i++ )
{
wchar_t *w;
- char *o, *n;
+ const char *o, *n;
char c;
- sb.used=0;
+ sb.clear();
while( rand() % ESCAPE_TEST_LENGTH )
{
c = rand ();
- b_append( &sb, &c, 1 );
+ sb.push_back(c);
}
c = 0;
- b_append( &sb, &c, 1 );
+ sb.push_back(c);
- o = (char *)sb.buff;
+ o = &sb.at(0);
w = str2wcs(o);
n = wcs2str(w);
@@ -265,7 +263,7 @@ static void test_convert()
err( L"Line %d - %d: Conversion cycle of string %s produced different string %s", __LINE__, i, o, n );
}
free( w );
- free( n );
+ free( (void *)n );
}