diff options
| author | Mike Buland <eichlan@xagasoft.com> | 2011-01-20 18:09:04 +0000 |
|---|---|---|
| committer | Mike Buland <eichlan@xagasoft.com> | 2011-01-20 18:09:04 +0000 |
| commit | 393f1b414746a7f1977971dd7659dd2b47092b11 (patch) | |
| tree | 81d0ca1ee70ab86a7d79c1991abe5c387b655fb2 /src/unit/queuebuf.unit | |
| parent | c259f95bd0e58b247940a339bb9b4b401b4e9438 (diff) | |
| parent | 7e25a863325dc3e9762397e700030969e093b087 (diff) | |
| download | libbu++-393f1b414746a7f1977971dd7659dd2b47092b11.tar.gz libbu++-393f1b414746a7f1977971dd7659dd2b47092b11.tar.bz2 libbu++-393f1b414746a7f1977971dd7659dd2b47092b11.tar.xz libbu++-393f1b414746a7f1977971dd7659dd2b47092b11.zip | |
Wow! Merged the branch, streams are updated, and there's no more FString, run
the fixstrings.sh script in the support directory to (hopefully) automatically
update your projects.
Diffstat (limited to '')
| -rw-r--r-- | src/unit/queuebuf.unit | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/unit/queuebuf.unit b/src/unit/queuebuf.unit index 29ba858..605490e 100644 --- a/src/unit/queuebuf.unit +++ b/src/unit/queuebuf.unit | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | // vim: syntax=cpp | 1 | // vim: syntax=cpp |
| 2 | /* | 2 | /* |
| 3 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 3 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
| 4 | * | 4 | * |
| 5 | * This file is part of the libbu++ library and is released under the | 5 | * This file is part of the libbu++ library and is released under the |
| 6 | * terms of the license contained in the file LICENSE. | 6 | * terms of the license contained in the file LICENSE. |
| @@ -30,7 +30,7 @@ suite QueueBuf | |||
| 30 | unitTest( qb.read( buf, 7 ) == 0 ); | 30 | unitTest( qb.read( buf, 7 ) == 0 ); |
| 31 | } | 31 | } |
| 32 | 32 | ||
| 33 | void QBUF_RANDSTR( Bu::FString &fill, unsigned int iSize ) | 33 | void QBUF_RANDSTR( Bu::String &fill, unsigned int iSize ) |
| 34 | { | 34 | { |
| 35 | char c; | 35 | char c; |
| 36 | for( unsigned int i=0; i<iSize; ++i ) | 36 | for( unsigned int i=0; i<iSize; ++i ) |
| @@ -44,7 +44,7 @@ suite QueueBuf | |||
| 44 | { | 44 | { |
| 45 | srandom(time(NULL)); | 45 | srandom(time(NULL)); |
| 46 | Bu::QueueBuf qb; | 46 | Bu::QueueBuf qb; |
| 47 | Bu::FString sTmp; | 47 | Bu::String sTmp; |
| 48 | char buf[4096]; | 48 | char buf[4096]; |
| 49 | 49 | ||
| 50 | for( int i=0; i<200; ++i ) | 50 | for( int i=0; i<200; ++i ) |
| @@ -65,12 +65,12 @@ suite QueueBuf | |||
| 65 | printf("%02x",(int)(uint8_t)s[i]); | 65 | printf("%02x",(int)(uint8_t)s[i]); |
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | void QBUF_HASH( Bu::FString &fill, const char *s, int iSize ) | 68 | void QBUF_HASH( Bu::String &fill, const char *s, int iSize ) |
| 69 | { | 69 | { |
| 70 | Bu::Md5 hash; | 70 | Bu::Md5 hash; |
| 71 | hash.reset(); | 71 | hash.reset(); |
| 72 | hash.addData( s, iSize ); | 72 | hash.addData( s, iSize ); |
| 73 | const Bu::FString &sTmp = hash.getResult(); | 73 | const Bu::String &sTmp = hash.getResult(); |
| 74 | fill.append( sTmp.getStr(), 16 ); | 74 | fill.append( sTmp.getStr(), 16 ); |
| 75 | } | 75 | } |
| 76 | 76 | ||
| @@ -78,8 +78,8 @@ suite QueueBuf | |||
| 78 | { | 78 | { |
| 79 | srandom(time(NULL)); | 79 | srandom(time(NULL)); |
| 80 | Bu::QueueBuf qb; | 80 | Bu::QueueBuf qb; |
| 81 | Bu::FString sTmp; | 81 | Bu::String sTmp; |
| 82 | Bu::FString sTmp2; | 82 | Bu::String sTmp2; |
| 83 | char buf[4096]; | 83 | char buf[4096]; |
| 84 | 84 | ||
| 85 | for( int i=0; i<200; ++i ) | 85 | for( int i=0; i<200; ++i ) |
