diff options
author | Mike Buland <eichlan@xagasoft.com> | 2011-01-20 05:30:43 +0000 |
---|---|---|
committer | Mike Buland <eichlan@xagasoft.com> | 2011-01-20 05:30:43 +0000 |
commit | 7c6c9538b03c9eae24e38fbeb30dd76a16aff1d2 (patch) | |
tree | e2d4bfccd81070adf7294ee54db2399df0c7171f | |
parent | f5aca1a1b402bd7ebc944dc6e6fe65828d863365 (diff) | |
download | libbu++-7c6c9538b03c9eae24e38fbeb30dd76a16aff1d2.tar.gz libbu++-7c6c9538b03c9eae24e38fbeb30dd76a16aff1d2.tar.bz2 libbu++-7c6c9538b03c9eae24e38fbeb30dd76a16aff1d2.tar.xz libbu++-7c6c9538b03c9eae24e38fbeb30dd76a16aff1d2.zip |
Wow, got the Stream changes propegated, all tests build with string instead of
fstring, and updated the copyright notice to extend to 2011
295 files changed, 890 insertions, 756 deletions
@@ -1,4 +1,4 @@ | |||
1 | Copyright (C) 2007-2010 Xagasoft | 1 | Copyright (C) 2007-2011 Xagasoft |
2 | 2 | ||
3 | All rights reserved. | 3 | All rights reserved. |
4 | 4 | ||
@@ -1,5 +1,5 @@ | |||
1 | # | 1 | # |
2 | # Copyright (C) 2007-2008 Xagasoft, All rights reserved. | 2 | # Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | # | 3 | # |
4 | # This file is part of the libbu++ library and is released under the | 4 | # This file is part of the libbu++ library and is released under the |
5 | # terms of the license contained in the file LICENSE. | 5 | # terms of the license contained in the file LICENSE. |
diff --git a/Makefile.legacy b/Makefile.legacy index b9b2305..15f8dfa 100644 --- a/Makefile.legacy +++ b/Makefile.legacy | |||
@@ -1,5 +1,5 @@ | |||
1 | # | 1 | # |
2 | # Copyright (C) 2007-2008 Xagasoft, All rights reserved. | 2 | # Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | # | 3 | # |
4 | # This file is part of the libbu++ library and is released under the | 4 | # This file is part of the libbu++ library and is released under the |
5 | # terms of the license contained in the file LICENSE. | 5 | # terms of the license contained in the file LICENSE. |
diff --git a/build.conf b/build.conf deleted file mode 100644 index b29809d..0000000 --- a/build.conf +++ /dev/null | |||
@@ -1,116 +0,0 @@ | |||
1 | # Build config file for libbu++ | ||
2 | # | ||
3 | # Copyright (C) 2007-2008 Xagasoft, All rights reserved. | ||
4 | # | ||
5 | # This file is part of the libbu++ library and is released under the | ||
6 | # terms of the license contained in the file LICENSE. | ||
7 | |||
8 | default action: check group "lnhdrs", check "libbu++.a", check group "tools" | ||
9 | "tests" action: check group "lnhdrs", check group "tests" | ||
10 | "all" action: check group "lnhdrs", check targets() | ||
11 | "optparser" action: check "tests/optparser" | ||
12 | |||
13 | set "CXXFLAGS" += "-ggdb -W -Wall" | ||
14 | #set "CXXFLAGS" += "-O2 -Wall" | ||
15 | |||
16 | # set "CXXFLAGS" += "-pg" | ||
17 | # set "LDFLAGS" += "-pg" | ||
18 | |||
19 | filesIn("src") filter regexp("^src/(.*)\\.h$", "bu/{re:1}.h"): | ||
20 | rule "hln", | ||
21 | group "lnhdrs", | ||
22 | target file, | ||
23 | input "src/{re:1}.h" | ||
24 | |||
25 | "libbu++.a": | ||
26 | rule "lib", | ||
27 | target file, | ||
28 | set "CXXFLAGS" += "-I. -fPIC", | ||
29 | input filesIn("src") filter regexp("^.*\\.cpp$") | ||
30 | |||
31 | #"libbu++.so": | ||
32 | # rule "so", | ||
33 | # target file, | ||
34 | # set "CXXFLAGS" += "-I. -fPIC", | ||
35 | # set "LDFLAGS" += "-lpthread -lbz2", | ||
36 | # input filesIn("src") filter regexp("^.*\\.cpp$") | ||
37 | |||
38 | |||
39 | directoriesIn("src/tests","tests/"): | ||
40 | rule "exe", | ||
41 | target file, | ||
42 | group "tests", | ||
43 | requires "libbu++.a", | ||
44 | set "CXXFLAGS" += "-I.", | ||
45 | set "LDFLAGS" += "-L. -lbu++", | ||
46 | input filesIn("{fulldir}") filter regexp("^.*\\.cpp$") | ||
47 | |||
48 | filesIn("src/tests") filter regexp("^src/tests/(.*)\\.cpp$", "tests/{re:1}"): | ||
49 | rule "exe", | ||
50 | target file, | ||
51 | group "tests", | ||
52 | requires "libbu++.a", | ||
53 | set "CXXFLAGS" += "-I.", | ||
54 | set "LDFLAGS" += "-L. -lbu++", | ||
55 | input "src/{target}.cpp" | ||
56 | |||
57 | filesIn("src/tools") filter regexp("^src/tools/(.*)\\.cpp$", "{re:1}"): | ||
58 | rule "exe", | ||
59 | target file, | ||
60 | group "tools", | ||
61 | requires "libbu++.a", | ||
62 | set "CXXFLAGS" += "-I.", | ||
63 | set "LDFLAGS" += "-L. -lbu++", | ||
64 | input "src/tools/{target}.cpp" | ||
65 | |||
66 | ["tests/itoqueue1", "tests/itoqueue2", "tests/socketblock", "tests/itoserver", | ||
67 | "tests/itoheap"]: | ||
68 | set "LDFLAGS" += "-lpthread" | ||
69 | |||
70 | filesIn("src/unit") filter regexp("^src/unit/(.*)\\.unit$", "unit/{re:1}"): | ||
71 | rule "exe", | ||
72 | target file, | ||
73 | group "tests", | ||
74 | group "unit", | ||
75 | requires "libbu++.a", | ||
76 | set "CXXFLAGS" += "-I.", | ||
77 | set "LDFLAGS" += "-L. -lbu++", | ||
78 | input "src/{target}.unit" | ||
79 | |||
80 | "tests/plugin": set "LDFLAGS" += "-ldl" | ||
81 | |||
82 | "tests/bzip2": set "LDFLAGS" += "-lbz2" | ||
83 | |||
84 | rule "exe": | ||
85 | matches regexp("(.*)\\.o$"), | ||
86 | aggregate toString(" "), | ||
87 | perform command("g++ -o {target} {match} {LDFLAGS}") | ||
88 | |||
89 | rule "lib": | ||
90 | matches regexp("(.*)\\.o$"), | ||
91 | aggregate toString(" "), | ||
92 | perform command("ar cr {target} {match}") | ||
93 | |||
94 | rule "so": | ||
95 | matches regexp("(.*)\\.o$"), | ||
96 | aggregate toString(" "), | ||
97 | perform command("g++ -shared -o {target} {match} {LDFLAGS}") | ||
98 | # perform command("ld -G -o {target} {match}") | ||
99 | |||
100 | rule "cpp": | ||
101 | matches regexp("(.*)\\.cpp$"), | ||
102 | produces "{re:1}.o", | ||
103 | requires commandToList("g++ -M {CXXFLAGS} {match}", "make"), | ||
104 | perform command("g++ {CXXFLAGS} -c -o {target} {match}") | ||
105 | |||
106 | rule "unit": | ||
107 | matches regexp("(.*)\\.unit$"), | ||
108 | produces "{re:1}.cpp", | ||
109 | requires "mkunit.sh", | ||
110 | perform command("./mkunit.sh \"{match}\" \"{target}\"") | ||
111 | |||
112 | rule "hln": | ||
113 | matches regexp("src/(.*)\\.h"), | ||
114 | produces "bu/{re:1}.h", | ||
115 | perform command("ln -s ../src/{re:1}.h {target}") | ||
116 | |||
diff --git a/buildMinGW.conf b/buildMinGW.conf deleted file mode 100644 index faf1088..0000000 --- a/buildMinGW.conf +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | # Build config file for libbu++ | ||
2 | # | ||
3 | # Copyright (C) 2007-2008 Xagasoft, All rights reserved. | ||
4 | # | ||
5 | # This file is part of the libbu++ library and is released under the | ||
6 | # terms of the license contained in the file LICENSE. | ||
7 | |||
8 | default action: check group "lnhdrs", check "libbu++win.a" | ||
9 | "tests" action: check group "lnhdrs", check group "tests" | ||
10 | "all" action: check group "lnhdrs", check targets() | ||
11 | |||
12 | set "CXXFLAGS" += "-ggdb -Wall" | ||
13 | |||
14 | filesIn("src") filter regexp("^src/(.*)\\.h$", "bu/{re:1}.h"): | ||
15 | rule "hln", | ||
16 | group "lnhdrs", | ||
17 | target file, | ||
18 | input "src/{re:1}.h" | ||
19 | |||
20 | "libbu++win.a": | ||
21 | rule "lib", | ||
22 | target file, | ||
23 | set "CXXFLAGS" += "-I. -Isupport/windows", | ||
24 | #input filesIn("src") filter regexp("^.*\\.cpp$") | ||
25 | input ["src/array.cpp", "src/list.cpp", "src/exceptionbase.cpp", "src/fbasicstring.cpp", "src/fstring.cpp", "src/file.cpp", "src/set.cpp", "src/hash.cpp", "src/sptr.cpp", "src/tafnode.cpp", "src/tafreader.cpp", "src/tafwriter.cpp", "src/tafgroup.cpp", "src/tafproperty.cpp", "src/tafcomment.cpp", "src/stdstream.cpp", "src/stream.cpp", "src/archive.cpp", "src/archival.cpp", "src/socket.cpp", "src/serversocket.cpp", "src/unitsuite.cpp", "src/win32_compatibility.cpp", "src/membuf.cpp", "src/formatter.cpp", "src/sio.cpp", "src/md5.cpp", "src/cryptohash.cpp", "src/filter.cpp", "src/bzip2.cpp", "src/base64.cpp", "src/minimacro.cpp", "src/formula.cpp", "src/util.cpp", "src/archivebase.cpp", "src/queue.cpp"] | ||
26 | |||
27 | rule "exe": | ||
28 | matches regexp("(.*)\\.win_o$"), | ||
29 | aggregate toString(" "), | ||
30 | perform command("wine c:/MinGW/bin/mingw32-g++.exe -o {target} {match} {LDFLAGS}") | ||
31 | |||
32 | rule "lib": | ||
33 | matches regexp("(.*)\\.win_o$"), | ||
34 | aggregate toString(" "), | ||
35 | perform command("wine c:/MinGW/bin/ar.exe cr {target} {match}") | ||
36 | |||
37 | rule "cpp": | ||
38 | matches regexp("(.*)\\.cpp$"), | ||
39 | produces "{re:1}.win_o", | ||
40 | requires commandToList("wine c:/MinGW/bin/mingw32-g++.exe -M {CXXFLAGS} {match}", "make"), | ||
41 | perform command("wine c:/MinGW/bin/mingw32-g++.exe {CXXFLAGS} -c -o {target} {match}") | ||
42 | |||
43 | rule "hln": | ||
44 | matches regexp("src/(.*)\\.h"), | ||
45 | produces "bu/{re:1}.h", | ||
46 | perform command("ln -s ../src/{re:1}.h {target}") | ||
47 | |||
diff --git a/default.bld b/default.bld index 50baefb..558b976 100644 --- a/default.bld +++ b/default.bld | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/fstringtest.dev b/fstringtest.dev deleted file mode 100644 index 297242d..0000000 --- a/fstringtest.dev +++ /dev/null | |||
@@ -1,59 +0,0 @@ | |||
1 | [Project] | ||
2 | FileName=fstringtest.dev | ||
3 | Name=fstringtest | ||
4 | UnitCount=1 | ||
5 | Type=1 | ||
6 | Ver=1 | ||
7 | ObjFiles= | ||
8 | Includes=z:\home\neonphog\wine_documents\libbu++\src\bu | ||
9 | Libs= | ||
10 | PrivateResource= | ||
11 | ResourceIncludes= | ||
12 | MakeIncludes= | ||
13 | Compiler= | ||
14 | CppCompiler=_@@_ | ||
15 | Linker=libbu++.a_@@_ | ||
16 | IsCpp=1 | ||
17 | Icon= | ||
18 | ExeOutput= | ||
19 | ObjectOutput= | ||
20 | OverrideOutput=0 | ||
21 | OverrideOutputName=fstringtest.exe | ||
22 | HostApplication= | ||
23 | Folders= | ||
24 | CommandLine= | ||
25 | UseCustomMakefile=0 | ||
26 | CustomMakefile= | ||
27 | IncludeVersionInfo=0 | ||
28 | SupportXPThemes=0 | ||
29 | CompilerSet=0 | ||
30 | CompilerSettings=0000000000000000000000 | ||
31 | |||
32 | [VersionInfo] | ||
33 | Major=0 | ||
34 | Minor=1 | ||
35 | Release=1 | ||
36 | Build=1 | ||
37 | LanguageID=1033 | ||
38 | CharsetID=1252 | ||
39 | CompanyName= | ||
40 | FileVersion= | ||
41 | FileDescription=Developed using the Dev-C++ IDE | ||
42 | InternalName= | ||
43 | LegalCopyright= | ||
44 | LegalTrademarks= | ||
45 | OriginalFilename= | ||
46 | ProductName= | ||
47 | ProductVersion= | ||
48 | AutoIncBuildNr=0 | ||
49 | |||
50 | [Unit1] | ||
51 | FileName=src\tests\fstring.cpp | ||
52 | CompileCpp=1 | ||
53 | Folder=fstringtest | ||
54 | Compile=1 | ||
55 | Link=1 | ||
56 | Priority=1000 | ||
57 | OverrideBuildCmd=0 | ||
58 | BuildCmd= | ||
59 | |||
@@ -1,7 +1,12 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. | ||
3 | * | ||
4 | * This file is part of the libbu++ library and is released under the | ||
5 | * terms of the license contained in the file LICENSE. | ||
6 | */ | ||
7 | |||
1 | /** | 8 | /** |
2 | * This is the default.bld file for libbu++, it pretty much handles everything | 9 | * This is just like default.bld, but for mingw...crazy, eh? |
3 | * libbu++ related, kinda' cool, eh? It can completely replace the old build | ||
4 | * and actually does a better job with a number of things. | ||
5 | */ | 10 | */ |
6 | 11 | ||
7 | CXXFLAGS += "-ggdb -W -Wall"; | 12 | CXXFLAGS += "-ggdb -W -Wall"; |
diff --git a/src/archival.cpp b/src/archival.cpp index bdd0620..687e8a3 100644 --- a/src/archival.cpp +++ b/src/archival.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/archival.h b/src/archival.h index 27e6aba..946167a 100644 --- a/src/archival.h +++ b/src/archival.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/archive.cpp b/src/archive.cpp index 7a10921..d300a87 100644 --- a/src/archive.cpp +++ b/src/archive.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/archive.h b/src/archive.h index 5294c15..61474a4 100644 --- a/src/archive.h +++ b/src/archive.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/archivebase.cpp b/src/archivebase.cpp index 5ca4c23..d00b1a5 100644 --- a/src/archivebase.cpp +++ b/src/archivebase.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/archivebase.h b/src/archivebase.h index 18591f0..4745d91 100644 --- a/src/archivebase.h +++ b/src/archivebase.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/array.cpp b/src/array.cpp index 62dd132..b776fed 100644 --- a/src/array.cpp +++ b/src/array.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/array.h b/src/array.h index f225c97..f091a81 100644 --- a/src/array.h +++ b/src/array.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/atom.cpp b/src/atom.cpp index 45fdbc5..3c77b90 100644 --- a/src/atom.cpp +++ b/src/atom.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/base64.cpp b/src/base64.cpp index 73ec8f3..18a18e5 100644 --- a/src/base64.cpp +++ b/src/base64.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -64,7 +64,7 @@ void Bu::Base64::start() | |||
64 | { | 64 | { |
65 | } | 65 | } |
66 | 66 | ||
67 | size_t Bu::Base64::stop() | 67 | Bu::size Bu::Base64::stop() |
68 | { | 68 | { |
69 | // if( eMode |= Encode ) | 69 | // if( eMode |= Encode ) |
70 | { | 70 | { |
@@ -89,11 +89,11 @@ size_t Bu::Base64::stop() | |||
89 | // } | 89 | // } |
90 | } | 90 | } |
91 | 91 | ||
92 | size_t Bu::Base64::read( void *pBuf, size_t nBytes ) | 92 | Bu::size Bu::Base64::read( void *pBuf, Bu::size nBytes ) |
93 | { | 93 | { |
94 | if( bEosIn == true && iRPos == iChars ) | 94 | if( bEosIn == true && iRPos == iChars ) |
95 | return 0; | 95 | return 0; |
96 | size_t sIn = 0; | 96 | Bu::size sIn = 0; |
97 | char buf[4]; | 97 | char buf[4]; |
98 | while( sIn < nBytes ) | 98 | while( sIn < nBytes ) |
99 | { | 99 | { |
@@ -153,11 +153,11 @@ size_t Bu::Base64::read( void *pBuf, size_t nBytes ) | |||
153 | return sIn; | 153 | return sIn; |
154 | } | 154 | } |
155 | 155 | ||
156 | size_t Bu::Base64::write( const void *pBuf, size_t nBytes ) | 156 | Bu::size Bu::Base64::write( const void *pBuf, Bu::size nBytes ) |
157 | { | 157 | { |
158 | size_t sOut = 0; | 158 | Bu::size sOut = 0; |
159 | char outBuf[4]; | 159 | char outBuf[4]; |
160 | for( size_t j = 0; j < nBytes; j++ ) | 160 | for( Bu::size j = 0; j < nBytes; j++ ) |
161 | { | 161 | { |
162 | iBuf |= (((uint8_t *)pBuf)[j])<<((2-iBPos++)*8); | 162 | iBuf |= (((uint8_t *)pBuf)[j])<<((2-iBPos++)*8); |
163 | if( iBPos == 3 ) | 163 | if( iBPos == 3 ) |
diff --git a/src/base64.h b/src/base64.h index c4dfd53..53d7860 100644 --- a/src/base64.h +++ b/src/base64.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -26,9 +26,9 @@ namespace Bu | |||
26 | virtual ~Base64(); | 26 | virtual ~Base64(); |
27 | 27 | ||
28 | virtual void start(); | 28 | virtual void start(); |
29 | virtual size_t stop(); | 29 | virtual Bu::size stop(); |
30 | virtual size_t read( void *pBuf, size_t nBytes ); | 30 | virtual Bu::size read( void *pBuf, Bu::size nBytes ); |
31 | virtual size_t write( const void *pBuf, size_t nBytes ); | 31 | virtual Bu::size write( const void *pBuf, Bu::size nBytes ); |
32 | 32 | ||
33 | virtual bool isOpen(); | 33 | virtual bool isOpen(); |
34 | 34 | ||
@@ -40,8 +40,8 @@ namespace Bu | |||
40 | int iRPos; | 40 | int iRPos; |
41 | int iChars; | 41 | int iChars; |
42 | bool bEosIn; | 42 | bool bEosIn; |
43 | size_t iTotalIn; | 43 | Bu::size iTotalIn; |
44 | size_t iTotalOut; | 44 | Bu::size iTotalOut; |
45 | static const char tblEnc[65]; | 45 | static const char tblEnc[65]; |
46 | char tblDec[80]; | 46 | char tblDec[80]; |
47 | enum Mode | 47 | enum Mode |
diff --git a/src/bitstring.cpp b/src/bitstring.cpp index 39c2e63..bdd1bc2 100644 --- a/src/bitstring.cpp +++ b/src/bitstring.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/bitstring.h b/src/bitstring.h index a8aec57..7a8fc48 100644 --- a/src/bitstring.h +++ b/src/bitstring.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/buffer.cpp b/src/buffer.cpp index 234dc92..b54f97e 100644 --- a/src/buffer.cpp +++ b/src/buffer.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -32,7 +32,7 @@ void Bu::Buffer::start() | |||
32 | { | 32 | { |
33 | } | 33 | } |
34 | 34 | ||
35 | size_t Bu::Buffer::stop() | 35 | Bu::size Bu::Buffer::stop() |
36 | { | 36 | { |
37 | iReadBufFill = iReadPos = iWriteBufFill = iWritePos = 0; | 37 | iReadBufFill = iReadPos = iWriteBufFill = iWritePos = 0; |
38 | return sSoFar; | 38 | return sSoFar; |
@@ -49,7 +49,7 @@ void Bu::Buffer::fillReadBuf() | |||
49 | } | 49 | } |
50 | } | 50 | } |
51 | 51 | ||
52 | size_t Bu::Buffer::read( void *pBuf, size_t nBytes ) | 52 | Bu::size Bu::Buffer::read( void *pBuf, Bu::size nBytes ) |
53 | { | 53 | { |
54 | if( nBytes <= 0 ) | 54 | if( nBytes <= 0 ) |
55 | { | 55 | { |
@@ -57,7 +57,7 @@ size_t Bu::Buffer::read( void *pBuf, size_t nBytes ) | |||
57 | return 0; | 57 | return 0; |
58 | } | 58 | } |
59 | 59 | ||
60 | size_t nTotRead = 0; | 60 | Bu::size nTotRead = 0; |
61 | // fillReadBuf(); | 61 | // fillReadBuf(); |
62 | 62 | ||
63 | do | 63 | do |
@@ -87,9 +87,9 @@ size_t Bu::Buffer::read( void *pBuf, size_t nBytes ) | |||
87 | return nTotRead; | 87 | return nTotRead; |
88 | } | 88 | } |
89 | 89 | ||
90 | size_t Bu::Buffer::write( const void *pBuf, size_t nBytes ) | 90 | Bu::size Bu::Buffer::write( const void *pBuf, Bu::size nBytes ) |
91 | { | 91 | { |
92 | size_t nTotWrote = 0; | 92 | Bu::size nTotWrote = 0; |
93 | 93 | ||
94 | do | 94 | do |
95 | { | 95 | { |
diff --git a/src/buffer.h b/src/buffer.h index 97d4127..17c6d73 100644 --- a/src/buffer.h +++ b/src/buffer.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -19,13 +19,13 @@ namespace Bu | |||
19 | virtual ~Buffer(); | 19 | virtual ~Buffer(); |
20 | 20 | ||
21 | virtual void start(); | 21 | virtual void start(); |
22 | virtual size_t stop(); | 22 | virtual Bu::size stop(); |
23 | 23 | ||
24 | virtual size_t read( void *pBuf, size_t nBytes ); | 24 | virtual Bu::size read( void *pBuf, Bu::size nBytes ); |
25 | virtual size_t write( const void *pBuf, size_t nBytes ); | 25 | virtual Bu::size write( const void *pBuf, Bu::size nBytes ); |
26 | using Stream::write; | 26 | using Stream::write; |
27 | 27 | ||
28 | size_t getReadFill() { return iReadBufFill; } | 28 | Bu::size getReadFill() { return iReadBufFill; } |
29 | bool isWritePending() { return iWriteBufFill > 0; } | 29 | bool isWritePending() { return iWriteBufFill > 0; } |
30 | 30 | ||
31 | virtual void flush(); | 31 | virtual void flush(); |
@@ -36,7 +36,7 @@ namespace Bu | |||
36 | void fillReadBuf(); | 36 | void fillReadBuf(); |
37 | 37 | ||
38 | private: | 38 | private: |
39 | size_t sSoFar; | 39 | Bu::size sSoFar; |
40 | int iBufSize; | 40 | int iBufSize; |
41 | char *sReadBuf; | 41 | char *sReadBuf; |
42 | char *sWriteBuf; | 42 | char *sWriteBuf; |
diff --git a/src/bzip2.cpp b/src/bzip2.cpp index a6fef25..5c35a26 100644 --- a/src/bzip2.cpp +++ b/src/bzip2.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -37,7 +37,7 @@ void Bu::BZip2::start() | |||
37 | pBuf = new char[nBufSize]; | 37 | pBuf = new char[nBufSize]; |
38 | } | 38 | } |
39 | 39 | ||
40 | size_t Bu::BZip2::stop() | 40 | Bu::size Bu::BZip2::stop() |
41 | { | 41 | { |
42 | TRACE(); | 42 | TRACE(); |
43 | if( bzState.state ) | 43 | if( bzState.state ) |
@@ -51,7 +51,7 @@ size_t Bu::BZip2::stop() | |||
51 | } | 51 | } |
52 | else | 52 | else |
53 | { | 53 | { |
54 | // size_t sTotal = 0; | 54 | // Bu::size sTotal = 0; |
55 | for(;;) | 55 | for(;;) |
56 | { | 56 | { |
57 | bzState.next_in = NULL; | 57 | bzState.next_in = NULL; |
@@ -119,7 +119,7 @@ void Bu::BZip2::bzError( int code ) | |||
119 | } | 119 | } |
120 | } | 120 | } |
121 | 121 | ||
122 | size_t Bu::BZip2::read( void *pData, size_t nBytes ) | 122 | Bu::size Bu::BZip2::read( void *pData, Bu::size nBytes ) |
123 | { | 123 | { |
124 | TRACE( pData, nBytes ); | 124 | TRACE( pData, nBytes ); |
125 | if( !bzState.state ) | 125 | if( !bzState.state ) |
@@ -177,7 +177,7 @@ size_t Bu::BZip2::read( void *pData, size_t nBytes ) | |||
177 | return 0; | 177 | return 0; |
178 | } | 178 | } |
179 | 179 | ||
180 | size_t Bu::BZip2::write( const void *pData, size_t nBytes ) | 180 | Bu::size Bu::BZip2::write( const void *pData, Bu::size nBytes ) |
181 | { | 181 | { |
182 | TRACE( pData, nBytes ); | 182 | TRACE( pData, nBytes ); |
183 | if( !bzState.state ) | 183 | if( !bzState.state ) |
@@ -188,7 +188,7 @@ size_t Bu::BZip2::write( const void *pData, size_t nBytes ) | |||
188 | if( bReading == true ) | 188 | if( bReading == true ) |
189 | throw ExceptionBase("This bzip2 filter is in reading mode, you can't write."); | 189 | throw ExceptionBase("This bzip2 filter is in reading mode, you can't write."); |
190 | 190 | ||
191 | // size_t sTotalOut = 0; | 191 | // Bu::size sTotalOut = 0; |
192 | bzState.next_in = (char *)pData; | 192 | bzState.next_in = (char *)pData; |
193 | bzState.avail_in = nBytes; | 193 | bzState.avail_in = nBytes; |
194 | for(;;) | 194 | for(;;) |
@@ -215,7 +215,7 @@ bool Bu::BZip2::isOpen() | |||
215 | return (bzState.state != NULL); | 215 | return (bzState.state != NULL); |
216 | } | 216 | } |
217 | 217 | ||
218 | size_t Bu::BZip2::getCompressedSize() | 218 | Bu::size Bu::BZip2::getCompressedSize() |
219 | { | 219 | { |
220 | return sTotalOut; | 220 | return sTotalOut; |
221 | } | 221 | } |
diff --git a/src/bzip2.h b/src/bzip2.h index 6494cbb..6da3dff 100644 --- a/src/bzip2.h +++ b/src/bzip2.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -26,13 +26,13 @@ namespace Bu | |||
26 | virtual ~BZip2(); | 26 | virtual ~BZip2(); |
27 | 27 | ||
28 | virtual void start(); | 28 | virtual void start(); |
29 | virtual size_t stop(); | 29 | virtual Bu::size stop(); |
30 | virtual size_t read( void *pBuf, size_t nBytes ); | 30 | virtual Bu::size read( void *pBuf, Bu::size nBytes ); |
31 | virtual size_t write( const void *pBuf, size_t nBytes ); | 31 | virtual Bu::size write( const void *pBuf, Bu::size nBytes ); |
32 | 32 | ||
33 | virtual bool isOpen(); | 33 | virtual bool isOpen(); |
34 | 34 | ||
35 | size_t getCompressedSize(); | 35 | Bu::size getCompressedSize(); |
36 | 36 | ||
37 | private: | 37 | private: |
38 | void bzError( int code ); | 38 | void bzError( int code ); |
@@ -41,7 +41,7 @@ namespace Bu | |||
41 | int nCompression; | 41 | int nCompression; |
42 | char *pBuf; | 42 | char *pBuf; |
43 | uint32_t nBufSize; | 43 | uint32_t nBufSize; |
44 | size_t sTotalOut; | 44 | Bu::size sTotalOut; |
45 | }; | 45 | }; |
46 | } | 46 | } |
47 | 47 | ||
diff --git a/src/cache.cpp b/src/cache.cpp index 928da68..52bd9fc 100644 --- a/src/cache.cpp +++ b/src/cache.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/cache.h b/src/cache.h index 7b55b80..926556d 100644 --- a/src/cache.h +++ b/src/cache.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/cachecalc.cpp b/src/cachecalc.cpp index d3ede87..7b8a10a 100644 --- a/src/cachecalc.cpp +++ b/src/cachecalc.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/cachecalc.h b/src/cachecalc.h index e23e6fd..89cfadc 100644 --- a/src/cachecalc.h +++ b/src/cachecalc.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/cachestore.cpp b/src/cachestore.cpp index 9b37e42..af49548 100644 --- a/src/cachestore.cpp +++ b/src/cachestore.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/cachestore.h b/src/cachestore.h index d35bc0a..d0d91a2 100644 --- a/src/cachestore.h +++ b/src/cachestore.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/cachestorefiles.cpp b/src/cachestorefiles.cpp index 7f9d76d..66ce672 100644 --- a/src/cachestorefiles.cpp +++ b/src/cachestorefiles.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/cachestorefiles.h b/src/cachestorefiles.h index 5a9478d..426cf83 100644 --- a/src/cachestorefiles.h +++ b/src/cachestorefiles.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/cachestoremyriad.cpp b/src/cachestoremyriad.cpp index b08aea1..9d00dce 100644 --- a/src/cachestoremyriad.cpp +++ b/src/cachestoremyriad.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/cachestoremyriad.h b/src/cachestoremyriad.h index 1928840..e632a82 100644 --- a/src/cachestoremyriad.h +++ b/src/cachestoremyriad.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/client.cpp b/src/client.cpp index c8d5dd4..02e51de 100644 --- a/src/client.cpp +++ b/src/client.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -40,7 +40,7 @@ Bu::Client::~Client() | |||
40 | void Bu::Client::processInput() | 40 | void Bu::Client::processInput() |
41 | { | 41 | { |
42 | char buf[RBS]; | 42 | char buf[RBS]; |
43 | size_t nRead, nTotal=0; | 43 | Bu::size nRead, nTotal=0; |
44 | 44 | ||
45 | for(;;) | 45 | for(;;) |
46 | { | 46 | { |
@@ -126,72 +126,72 @@ bool Bu::Client::isOpen() | |||
126 | return pTopStream->isOpen(); | 126 | return pTopStream->isOpen(); |
127 | } | 127 | } |
128 | 128 | ||
129 | size_t Bu::Client::write( const Bu::String &sData ) | 129 | Bu::size Bu::Client::write( const Bu::String &sData ) |
130 | { | 130 | { |
131 | return qbWrite.write( sData.getStr(), sData.getSize() ); | 131 | return qbWrite.write( sData.getStr(), sData.getSize() ); |
132 | } | 132 | } |
133 | 133 | ||
134 | size_t Bu::Client::write( const void *pData, size_t nBytes ) | 134 | Bu::size Bu::Client::write( const void *pData, Bu::size nBytes ) |
135 | { | 135 | { |
136 | return qbWrite.write( pData, nBytes ); | 136 | return qbWrite.write( pData, nBytes ); |
137 | } | 137 | } |
138 | 138 | ||
139 | size_t Bu::Client::write( int8_t nData ) | 139 | Bu::size Bu::Client::write( int8_t nData ) |
140 | { | 140 | { |
141 | return qbWrite.write( (const char *)&nData, sizeof(nData) ); | 141 | return qbWrite.write( (const char *)&nData, sizeof(nData) ); |
142 | } | 142 | } |
143 | 143 | ||
144 | size_t Bu::Client::write( int16_t nData ) | 144 | Bu::size Bu::Client::write( int16_t nData ) |
145 | { | 145 | { |
146 | return qbWrite.write( (const char *)&nData, sizeof(nData) ); | 146 | return qbWrite.write( (const char *)&nData, sizeof(nData) ); |
147 | } | 147 | } |
148 | 148 | ||
149 | size_t Bu::Client::write( int32_t nData ) | 149 | Bu::size Bu::Client::write( int32_t nData ) |
150 | { | 150 | { |
151 | return qbWrite.write( (const char *)&nData, sizeof(nData) ); | 151 | return qbWrite.write( (const char *)&nData, sizeof(nData) ); |
152 | } | 152 | } |
153 | 153 | ||
154 | size_t Bu::Client::write( int64_t nData ) | 154 | Bu::size Bu::Client::write( int64_t nData ) |
155 | { | 155 | { |
156 | return qbWrite.write( (const char *)&nData, sizeof(nData) ); | 156 | return qbWrite.write( (const char *)&nData, sizeof(nData) ); |
157 | } | 157 | } |
158 | 158 | ||
159 | size_t Bu::Client::write( uint8_t nData ) | 159 | Bu::size Bu::Client::write( uint8_t nData ) |
160 | { | 160 | { |
161 | return qbWrite.write( (const char *)&nData, sizeof(nData) ); | 161 | return qbWrite.write( (const char *)&nData, sizeof(nData) ); |
162 | } | 162 | } |
163 | 163 | ||
164 | size_t Bu::Client::write( uint16_t nData ) | 164 | Bu::size Bu::Client::write( uint16_t nData ) |
165 | { | 165 | { |
166 | return qbWrite.write( (const char *)&nData, sizeof(nData) ); | 166 | return qbWrite.write( (const char *)&nData, sizeof(nData) ); |
167 | } | 167 | } |
168 | 168 | ||
169 | size_t Bu::Client::write( uint32_t nData ) | 169 | Bu::size Bu::Client::write( uint32_t nData ) |
170 | { | 170 | { |
171 | return qbWrite.write( (const char *)&nData, sizeof(nData) ); | 171 | return qbWrite.write( (const char *)&nData, sizeof(nData) ); |
172 | } | 172 | } |
173 | 173 | ||
174 | size_t Bu::Client::write( uint64_t nData ) | 174 | Bu::size Bu::Client::write( uint64_t nData ) |
175 | { | 175 | { |
176 | return qbWrite.write( (const char *)&nData, sizeof(nData) ); | 176 | return qbWrite.write( (const char *)&nData, sizeof(nData) ); |
177 | } | 177 | } |
178 | 178 | ||
179 | size_t Bu::Client::read( void *pData, size_t nBytes ) | 179 | Bu::size Bu::Client::read( void *pData, Bu::size nBytes ) |
180 | { | 180 | { |
181 | return qbRead.read( pData, nBytes ); | 181 | return qbRead.read( pData, nBytes ); |
182 | } | 182 | } |
183 | 183 | ||
184 | size_t Bu::Client::peek( void *pData, int nBytes, int nOffset ) | 184 | Bu::size Bu::Client::peek( void *pData, int nBytes, int nOffset ) |
185 | { | 185 | { |
186 | return qbRead.peek( pData, nBytes, nOffset ); | 186 | return qbRead.peek( pData, nBytes, nOffset ); |
187 | } | 187 | } |
188 | 188 | ||
189 | long Bu::Client::getInputSize() | 189 | Bu::size Bu::Client::getInputSize() |
190 | { | 190 | { |
191 | return qbRead.getSize(); | 191 | return qbRead.getSize(); |
192 | } | 192 | } |
193 | 193 | ||
194 | long Bu::Client::getOutputSize() | 194 | Bu::size Bu::Client::getOutputSize() |
195 | { | 195 | { |
196 | return qbWrite.getSize(); | 196 | return qbWrite.getSize(); |
197 | } | 197 | } |
@@ -233,22 +233,22 @@ void Bu::Client::tick() | |||
233 | pProto->onTick( this ); | 233 | pProto->onTick( this ); |
234 | } | 234 | } |
235 | 235 | ||
236 | long Bu::Client::tell() | 236 | Bu::size Bu::Client::tell() |
237 | { | 237 | { |
238 | return 0; | 238 | return 0; |
239 | } | 239 | } |
240 | 240 | ||
241 | void Bu::Client::seek( long offset ) | 241 | void Bu::Client::seek( Bu::size offset ) |
242 | { | 242 | { |
243 | return qbRead.seek( offset ); | 243 | return qbRead.seek( offset ); |
244 | } | 244 | } |
245 | 245 | ||
246 | void Bu::Client::setPos( long ) | 246 | void Bu::Client::setPos( Bu::size ) |
247 | { | 247 | { |
248 | throw Bu::ExceptionBase(); | 248 | throw Bu::ExceptionBase(); |
249 | } | 249 | } |
250 | 250 | ||
251 | void Bu::Client::setPosEnd( long ) | 251 | void Bu::Client::setPosEnd( Bu::size ) |
252 | { | 252 | { |
253 | throw Bu::ExceptionBase(); | 253 | throw Bu::ExceptionBase(); |
254 | } | 254 | } |
@@ -298,8 +298,23 @@ void Bu::Client::setBlocking( bool ) | |||
298 | throw Bu::ExceptionBase(); | 298 | throw Bu::ExceptionBase(); |
299 | } | 299 | } |
300 | 300 | ||
301 | void Bu::Client::setSize( long ) | 301 | void Bu::Client::setSize( Bu::size ) |
302 | { | 302 | { |
303 | throw Bu::ExceptionBase(); | 303 | throw Bu::ExceptionBase(); |
304 | } | 304 | } |
305 | 305 | ||
306 | Bu::size Bu::Client::getSize() const | ||
307 | { | ||
308 | return 0; | ||
309 | } | ||
310 | |||
311 | Bu::size Bu::Client::getBlockSize() const | ||
312 | { | ||
313 | return pSocket->getBlockSize(); | ||
314 | } | ||
315 | |||
316 | Bu::String Bu::Client::getLocation() const | ||
317 | { | ||
318 | return pSocket->getLocation(); | ||
319 | } | ||
320 | |||
diff --git a/src/client.h b/src/client.h index 871acad..119c2c1 100644 --- a/src/client.h +++ b/src/client.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -35,21 +35,21 @@ namespace Bu | |||
35 | 35 | ||
36 | //Bu::String &getInput(); | 36 | //Bu::String &getInput(); |
37 | //Bu::String &getOutput(); | 37 | //Bu::String &getOutput(); |
38 | size_t write( const Bu::String &sData ); | 38 | Bu::size write( const Bu::String &sData ); |
39 | size_t write( const void *pData, size_t nBytes ); | 39 | Bu::size write( const void *pData, Bu::size nBytes ); |
40 | size_t write( int8_t nData ); | 40 | Bu::size write( int8_t nData ); |
41 | size_t write( int16_t nData ); | 41 | Bu::size write( int16_t nData ); |
42 | size_t write( int32_t nData ); | 42 | Bu::size write( int32_t nData ); |
43 | size_t write( int64_t nData ); | 43 | Bu::size write( int64_t nData ); |
44 | size_t write( uint8_t nData ); | 44 | Bu::size write( uint8_t nData ); |
45 | size_t write( uint16_t nData ); | 45 | Bu::size write( uint16_t nData ); |
46 | size_t write( uint32_t nData ); | 46 | Bu::size write( uint32_t nData ); |
47 | size_t write( uint64_t nData ); | 47 | Bu::size write( uint64_t nData ); |
48 | size_t read( void *pData, size_t nBytes ); | 48 | Bu::size read( void *pData, Bu::size nBytes ); |
49 | size_t peek( void *pData, int nBytes, int nOffset=0 ); | 49 | Bu::size peek( void *pData, int nBytes, int nOffset=0 ); |
50 | // void seek( int nBytes ); | 50 | // void seek( int nBytes ); |
51 | long getInputSize(); | 51 | Bu::size getInputSize(); |
52 | long getOutputSize(); | 52 | Bu::size getOutputSize(); |
53 | 53 | ||
54 | void setProtocol( Protocol *pProto ); | 54 | void setProtocol( Protocol *pProto ); |
55 | Bu::Protocol *getProtocol(); | 55 | Bu::Protocol *getProtocol(); |
@@ -99,10 +99,10 @@ namespace Bu | |||
99 | * These are required to qualify as a stream, I dunno how many will | 99 | * These are required to qualify as a stream, I dunno how many will |
100 | * be implemented. | 100 | * be implemented. |
101 | */ | 101 | */ |
102 | virtual long tell(); | 102 | virtual Bu::size tell(); |
103 | virtual void seek( long offset ); | 103 | virtual void seek( Bu::size offset ); |
104 | virtual void setPos( long pos ); | 104 | virtual void setPos( Bu::size pos ); |
105 | virtual void setPosEnd( long pos ); | 105 | virtual void setPosEnd( Bu::size pos ); |
106 | virtual bool isEos(); | 106 | virtual bool isEos(); |
107 | virtual void flush(); | 107 | virtual void flush(); |
108 | virtual bool canRead(); | 108 | virtual bool canRead(); |
@@ -112,7 +112,10 @@ namespace Bu | |||
112 | virtual bool isSeekable(); | 112 | virtual bool isSeekable(); |
113 | virtual bool isBlocking(); | 113 | virtual bool isBlocking(); |
114 | virtual void setBlocking( bool bBlocking=true ); | 114 | virtual void setBlocking( bool bBlocking=true ); |
115 | virtual void setSize( long iSize ); | 115 | virtual void setSize( Bu::size iSize ); |
116 | virtual size getSize() const; | ||
117 | virtual size getBlockSize() const; | ||
118 | virtual Bu::String getLocation() const; | ||
116 | 119 | ||
117 | private: | 120 | private: |
118 | typedef Bu::List<Bu::Stream *> FilterList; | 121 | typedef Bu::List<Bu::Stream *> FilterList; |
diff --git a/src/clientlink.cpp b/src/clientlink.cpp index 765e6a5..ce8b2cb 100644 --- a/src/clientlink.cpp +++ b/src/clientlink.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/clientlink.h b/src/clientlink.h index 28910bb..e4618e7 100644 --- a/src/clientlink.h +++ b/src/clientlink.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/clientlinkfactory.cpp b/src/clientlinkfactory.cpp index 5f17b50..f48e11e 100644 --- a/src/clientlinkfactory.cpp +++ b/src/clientlinkfactory.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/clientlinkfactory.h b/src/clientlinkfactory.h index a5f033c..21d3363 100644 --- a/src/clientlinkfactory.h +++ b/src/clientlinkfactory.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/compat/linux.h b/src/compat/linux.h index ccc8536..7eaed8e 100644 --- a/src/compat/linux.h +++ b/src/compat/linux.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/compat/osx.h b/src/compat/osx.h index 7169d7e..19628a3 100644 --- a/src/compat/osx.h +++ b/src/compat/osx.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/compat/win32.cpp b/src/compat/win32.cpp index 6fcac15..2a43ff9 100644 --- a/src/compat/win32.cpp +++ b/src/compat/win32.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/compat/win32.h b/src/compat/win32.h index 82ab4d6..67d80d3 100644 --- a/src/compat/win32.h +++ b/src/compat/win32.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/conduit.cpp b/src/conduit.cpp index 36cda01..bb99526 100644 --- a/src/conduit.cpp +++ b/src/conduit.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/conduit.h b/src/conduit.h index f8ad4fa..cc88667 100644 --- a/src/conduit.h +++ b/src/conduit.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/config.h b/src/config.h index 3a19a1f..3046b59 100644 --- a/src/config.h +++ b/src/config.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/crypt.cpp b/src/crypt.cpp index 97260c9..eb87479 100644 --- a/src/crypt.cpp +++ b/src/crypt.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/crypt.h b/src/crypt.h index d6bfe4b..a94402a 100644 --- a/src/crypt.h +++ b/src/crypt.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/cryptohash.cpp b/src/cryptohash.cpp index bb07a4b..ddd293c 100644 --- a/src/cryptohash.cpp +++ b/src/cryptohash.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/cryptohash.h b/src/cryptohash.h index 56dc356..bc5435f 100644 --- a/src/cryptohash.h +++ b/src/cryptohash.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/csvreader.cpp b/src/csvreader.cpp index 22b0608..4da7883 100644 --- a/src/csvreader.cpp +++ b/src/csvreader.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/csvreader.h b/src/csvreader.h index 1c3525c..2e9e7b0 100644 --- a/src/csvreader.h +++ b/src/csvreader.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/csvwriter.cpp b/src/csvwriter.cpp index 6b50ed0..58437b8 100644 --- a/src/csvwriter.cpp +++ b/src/csvwriter.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/csvwriter.h b/src/csvwriter.h index 8da5eee..4291ed5 100644 --- a/src/csvwriter.h +++ b/src/csvwriter.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/doxy/archives.dox b/src/doxy/archives.dox index 1eaa1e5..7155227 100644 --- a/src/doxy/archives.dox +++ b/src/doxy/archives.dox | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/doxy/formatting.dox b/src/doxy/formatting.dox index 6787461..7acb9de 100644 --- a/src/doxy/formatting.dox +++ b/src/doxy/formatting.dox | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/doxy/groups.dox b/src/doxy/groups.dox index 58d5d05..479186a 100644 --- a/src/doxy/groups.dox +++ b/src/doxy/groups.dox | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/doxy/main.dox b/src/doxy/main.dox index c4c3ada..2964ee5 100644 --- a/src/doxy/main.dox +++ b/src/doxy/main.dox | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/doxy/params.dox b/src/doxy/params.dox index 74e7ddc..78c3e63 100644 --- a/src/doxy/params.dox +++ b/src/doxy/params.dox | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/doxy/plugins.dox b/src/doxy/plugins.dox index b29e6a4..d913430 100644 --- a/src/doxy/plugins.dox +++ b/src/doxy/plugins.dox | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/doxy/servers.dox b/src/doxy/servers.dox index 7bda7c1..c344b8a 100644 --- a/src/doxy/servers.dox +++ b/src/doxy/servers.dox | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/doxy/streams.dox b/src/doxy/streams.dox index 0be3736..c039804 100644 --- a/src/doxy/streams.dox +++ b/src/doxy/streams.dox | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/doxy/taf.dox b/src/doxy/taf.dox index d8a5410..15692f4 100644 --- a/src/doxy/taf.dox +++ b/src/doxy/taf.dox | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/doxy/threading.dox b/src/doxy/threading.dox index 0ecf1f4..9a04ecb 100644 --- a/src/doxy/threading.dox +++ b/src/doxy/threading.dox | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/doxy/unittest.dox b/src/doxy/unittest.dox index 24e1de4..5304551 100644 --- a/src/doxy/unittest.dox +++ b/src/doxy/unittest.dox | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/exceptionbase.cpp b/src/exceptionbase.cpp index 3b4f87a..13a98db 100644 --- a/src/exceptionbase.cpp +++ b/src/exceptionbase.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/exceptionbase.h b/src/exceptionbase.h index c92962f..b6ad9ca 100644 --- a/src/exceptionbase.h +++ b/src/exceptionbase.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/extratypes.h b/src/extratypes.h index bc32dcd..0dd92db 100644 --- a/src/extratypes.h +++ b/src/extratypes.h | |||
@@ -1,8 +1,17 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. | ||
3 | * | ||
4 | * This file is part of the libbu++ library and is released under the | ||
5 | * terms of the license contained in the file LICENSE. | ||
6 | */ | ||
7 | |||
1 | #ifndef EXTRA_TYPES_H | 8 | #ifndef EXTRA_TYPES_H |
2 | #define EXTRA_TYPES_H | 9 | #define EXTRA_TYPES_H |
3 | 10 | ||
4 | #include "bu/config.h" | 11 | #include "bu/config.h" |
5 | 12 | ||
13 | #include <stdint.h> | ||
14 | |||
6 | namespace Bu | 15 | namespace Bu |
7 | { | 16 | { |
8 | #ifdef USE_64BIT_IO | 17 | #ifdef USE_64BIT_IO |
diff --git a/src/fastcgi.cpp b/src/fastcgi.cpp index 1b012e8..2f9161e 100644 --- a/src/fastcgi.cpp +++ b/src/fastcgi.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/fastcgi.h b/src/fastcgi.h index 4463bee..1a3d02e 100644 --- a/src/fastcgi.h +++ b/src/fastcgi.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/fifo.cpp b/src/fifo.cpp index d6106cc..b0cf1c7 100644 --- a/src/fifo.cpp +++ b/src/fifo.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -67,7 +67,7 @@ void Bu::Fifo::close() | |||
67 | } | 67 | } |
68 | } | 68 | } |
69 | 69 | ||
70 | size_t Bu::Fifo::read( void *pBuf, size_t nBytes ) | 70 | Bu::size Bu::Fifo::read( void *pBuf, Bu::size nBytes ) |
71 | { | 71 | { |
72 | if( iIn < 0 ) | 72 | if( iIn < 0 ) |
73 | throw FifoException("Fifo not open for reading."); | 73 | throw FifoException("Fifo not open for reading."); |
@@ -75,7 +75,7 @@ size_t Bu::Fifo::read( void *pBuf, size_t nBytes ) | |||
75 | return TEMP_FAILURE_RETRY( ::read( iIn, pBuf, nBytes ) ); | 75 | return TEMP_FAILURE_RETRY( ::read( iIn, pBuf, nBytes ) ); |
76 | } | 76 | } |
77 | 77 | ||
78 | size_t Bu::Fifo::write( const void *pBuf, size_t nBytes ) | 78 | Bu::size Bu::Fifo::write( const void *pBuf, Bu::size nBytes ) |
79 | { | 79 | { |
80 | if( iOut < 0 ) | 80 | if( iOut < 0 ) |
81 | throw FifoException("Fifo not open for writing."); | 81 | throw FifoException("Fifo not open for writing."); |
@@ -83,20 +83,20 @@ size_t Bu::Fifo::write( const void *pBuf, size_t nBytes ) | |||
83 | return TEMP_FAILURE_RETRY( ::write( iOut, pBuf, nBytes ) ); | 83 | return TEMP_FAILURE_RETRY( ::write( iOut, pBuf, nBytes ) ); |
84 | } | 84 | } |
85 | 85 | ||
86 | long Bu::Fifo::tell() | 86 | Bu::size Bu::Fifo::tell() |
87 | { | 87 | { |
88 | return -1; | 88 | return -1; |
89 | } | 89 | } |
90 | 90 | ||
91 | void Bu::Fifo::seek( long ) | 91 | void Bu::Fifo::seek( Bu::size ) |
92 | { | 92 | { |
93 | } | 93 | } |
94 | 94 | ||
95 | void Bu::Fifo::setPos( long ) | 95 | void Bu::Fifo::setPos( Bu::size ) |
96 | { | 96 | { |
97 | } | 97 | } |
98 | 98 | ||
99 | void Bu::Fifo::setPosEnd( long ) | 99 | void Bu::Fifo::setPosEnd( Bu::size ) |
100 | { | 100 | { |
101 | } | 101 | } |
102 | 102 | ||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -31,14 +31,14 @@ namespace Bu | |||
31 | virtual ~Fifo(); | 31 | virtual ~Fifo(); |
32 | 32 | ||
33 | virtual void close(); | 33 | virtual void close(); |
34 | virtual size_t read( void *pBuf, size_t nBytes ); | 34 | virtual Bu::size read( void *pBuf, Bu::size nBytes ); |
35 | virtual size_t write( const void *pBuf, size_t nBytes ); | 35 | virtual Bu::size write( const void *pBuf, Bu::size nBytes ); |
36 | using Stream::write; | 36 | using Stream::write; |
37 | 37 | ||
38 | virtual long tell(); | 38 | virtual Bu::size tell(); |
39 | virtual void seek( long offset ); | 39 | virtual void seek( Bu::size offset ); |
40 | virtual void setPos( long pos ); | 40 | virtual void setPos( Bu::size pos ); |
41 | virtual void setPosEnd( long pos ); | 41 | virtual void setPosEnd( Bu::size pos ); |
42 | virtual bool isEos(); | 42 | virtual bool isEos(); |
43 | virtual bool isOpen(); | 43 | virtual bool isOpen(); |
44 | 44 | ||
diff --git a/src/file.cpp b/src/file.cpp index 6634a62..09d53de 100644 --- a/src/file.cpp +++ b/src/file.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -59,12 +59,12 @@ void Bu::File::close() | |||
59 | } | 59 | } |
60 | } | 60 | } |
61 | 61 | ||
62 | size_t Bu::File::read( void *pBuf, size_t nBytes ) | 62 | Bu::size Bu::File::read( void *pBuf, Bu::size nBytes ) |
63 | { | 63 | { |
64 | if( fd < 0 ) | 64 | if( fd < 0 ) |
65 | throw FileException("File not open."); | 65 | throw FileException("File not open."); |
66 | 66 | ||
67 | ssize_t iRead = ::read( fd, pBuf, nBytes ); | 67 | Bu::size iRead = ::read( fd, pBuf, nBytes ); |
68 | if( iRead == 0 ) | 68 | if( iRead == 0 ) |
69 | bEos = true; | 69 | bEos = true; |
70 | else if( iRead == -1 && errno == EAGAIN ) | 70 | else if( iRead == -1 && errno == EAGAIN ) |
@@ -74,18 +74,18 @@ size_t Bu::File::read( void *pBuf, size_t nBytes ) | |||
74 | return iRead; | 74 | return iRead; |
75 | } | 75 | } |
76 | 76 | ||
77 | size_t Bu::File::write( const void *pBuf, size_t nBytes ) | 77 | Bu::size Bu::File::write( const void *pBuf, Bu::size nBytes ) |
78 | { | 78 | { |
79 | if( fd < 0 ) | 79 | if( fd < 0 ) |
80 | throw FileException("File not open."); | 80 | throw FileException("File not open."); |
81 | 81 | ||
82 | ssize_t iWrote = ::write( fd, pBuf, nBytes ); | 82 | Bu::size iWrote = ::write( fd, pBuf, nBytes ); |
83 | if( iWrote < 0 ) | 83 | if( iWrote < 0 ) |
84 | throw FileException( errno, "%s", strerror( errno ) ); | 84 | throw FileException( errno, "%s", strerror( errno ) ); |
85 | return iWrote; | 85 | return iWrote; |
86 | } | 86 | } |
87 | 87 | ||
88 | long Bu::File::tell() | 88 | Bu::size Bu::File::tell() |
89 | { | 89 | { |
90 | if( fd < 0 ) | 90 | if( fd < 0 ) |
91 | throw FileException("File not open."); | 91 | throw FileException("File not open."); |
@@ -93,7 +93,7 @@ long Bu::File::tell() | |||
93 | return lseek( fd, 0, SEEK_CUR ); | 93 | return lseek( fd, 0, SEEK_CUR ); |
94 | } | 94 | } |
95 | 95 | ||
96 | void Bu::File::seek( long offset ) | 96 | void Bu::File::seek( Bu::size offset ) |
97 | { | 97 | { |
98 | if( fd < 0 ) | 98 | if( fd < 0 ) |
99 | throw FileException("File not open."); | 99 | throw FileException("File not open."); |
@@ -102,7 +102,7 @@ void Bu::File::seek( long offset ) | |||
102 | bEos = false; | 102 | bEos = false; |
103 | } | 103 | } |
104 | 104 | ||
105 | void Bu::File::setPos( long pos ) | 105 | void Bu::File::setPos( Bu::size pos ) |
106 | { | 106 | { |
107 | if( fd < 0 ) | 107 | if( fd < 0 ) |
108 | throw FileException("File not open."); | 108 | throw FileException("File not open."); |
@@ -111,7 +111,7 @@ void Bu::File::setPos( long pos ) | |||
111 | bEos = false; | 111 | bEos = false; |
112 | } | 112 | } |
113 | 113 | ||
114 | void Bu::File::setPosEnd( long pos ) | 114 | void Bu::File::setPosEnd( Bu::size pos ) |
115 | { | 115 | { |
116 | if( fd < 0 ) | 116 | if( fd < 0 ) |
117 | throw FileException("File not open."); | 117 | throw FileException("File not open."); |
@@ -218,7 +218,7 @@ Bu::File Bu::File::tempFile( Bu::String &sName ) | |||
218 | " iterations."); | 218 | " iterations."); |
219 | } | 219 | } |
220 | 220 | ||
221 | void Bu::File::setSize( long iSize ) | 221 | void Bu::File::setSize( Bu::size iSize ) |
222 | { | 222 | { |
223 | #ifdef WIN32 | 223 | #ifdef WIN32 |
224 | chsize( fd, iSize ); | 224 | chsize( fd, iSize ); |
@@ -227,6 +227,25 @@ void Bu::File::setSize( long iSize ) | |||
227 | #endif | 227 | #endif |
228 | } | 228 | } |
229 | 229 | ||
230 | Bu::size Bu::File::getSize() const | ||
231 | { | ||
232 | struct stat st; | ||
233 | fstat( fd, &st ); | ||
234 | return st.st_size; | ||
235 | } | ||
236 | |||
237 | Bu::size Bu::File::getBlockSize() const | ||
238 | { | ||
239 | struct stat st; | ||
240 | fstat( fd, &st ); | ||
241 | return st.st_blksize; | ||
242 | } | ||
243 | |||
244 | Bu::String Bu::File::getLocation() const | ||
245 | { | ||
246 | return "to be implemented"; | ||
247 | } | ||
248 | |||
230 | #ifndef WIN32 | 249 | #ifndef WIN32 |
231 | void Bu::File::chmod( mode_t t ) | 250 | void Bu::File::chmod( mode_t t ) |
232 | { | 251 | { |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -31,14 +31,14 @@ namespace Bu | |||
31 | virtual ~File(); | 31 | virtual ~File(); |
32 | 32 | ||
33 | virtual void close(); | 33 | virtual void close(); |
34 | virtual size_t read( void *pBuf, size_t nBytes ); | 34 | virtual Bu::size read( void *pBuf, Bu::size nBytes ); |
35 | virtual size_t write( const void *pBuf, size_t nBytes ); | 35 | virtual Bu::size write( const void *pBuf, Bu::size nBytes ); |
36 | using Stream::write; | 36 | using Stream::write; |
37 | 37 | ||
38 | virtual long tell(); | 38 | virtual Bu::size tell(); |
39 | virtual void seek( long offset ); | 39 | virtual void seek( Bu::size offset ); |
40 | virtual void setPos( long pos ); | 40 | virtual void setPos( Bu::size pos ); |
41 | virtual void setPosEnd( long pos ); | 41 | virtual void setPosEnd( Bu::size pos ); |
42 | virtual bool isEos(); | 42 | virtual bool isEos(); |
43 | virtual bool isOpen(); | 43 | virtual bool isOpen(); |
44 | 44 | ||
@@ -70,7 +70,11 @@ namespace Bu | |||
70 | /// Same as Write|Create|Truncate | 70 | /// Same as Write|Create|Truncate |
71 | }; | 71 | }; |
72 | 72 | ||
73 | virtual void setSize( long iSize ); | 73 | virtual void setSize( Bu::size iSize ); |
74 | |||
75 | virtual size getSize() const; | ||
76 | virtual size getBlockSize() const; | ||
77 | virtual Bu::String getLocation() const; | ||
74 | 78 | ||
75 | /** | 79 | /** |
76 | * Create a temp file and return its handle. The file is opened | 80 | * Create a temp file and return its handle. The file is opened |
diff --git a/src/filter.cpp b/src/filter.cpp index 900baaa..3fe8f0e 100644 --- a/src/filter.cpp +++ b/src/filter.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -22,22 +22,22 @@ void Bu::Filter::close() | |||
22 | rNext.close(); | 22 | rNext.close(); |
23 | } | 23 | } |
24 | 24 | ||
25 | long Bu::Filter::tell() | 25 | Bu::size Bu::Filter::tell() |
26 | { | 26 | { |
27 | return rNext.tell(); | 27 | return rNext.tell(); |
28 | } | 28 | } |
29 | 29 | ||
30 | void Bu::Filter::seek( long offset ) | 30 | void Bu::Filter::seek( Bu::size offset ) |
31 | { | 31 | { |
32 | rNext.seek( offset ); | 32 | rNext.seek( offset ); |
33 | } | 33 | } |
34 | 34 | ||
35 | void Bu::Filter::setPos( long pos ) | 35 | void Bu::Filter::setPos( Bu::size pos ) |
36 | { | 36 | { |
37 | rNext.setPos( pos ); | 37 | rNext.setPos( pos ); |
38 | } | 38 | } |
39 | 39 | ||
40 | void Bu::Filter::setPosEnd( long pos ) | 40 | void Bu::Filter::setPosEnd( Bu::size pos ) |
41 | { | 41 | { |
42 | rNext.setPosEnd( pos ); | 42 | rNext.setPosEnd( pos ); |
43 | } | 43 | } |
@@ -87,7 +87,7 @@ void Bu::Filter::setBlocking( bool bBlocking ) | |||
87 | rNext.setBlocking( bBlocking ); | 87 | rNext.setBlocking( bBlocking ); |
88 | } | 88 | } |
89 | 89 | ||
90 | void Bu::Filter::setSize( long ) | 90 | void Bu::Filter::setSize( Bu::size ) |
91 | { | 91 | { |
92 | } | 92 | } |
93 | 93 | ||
@@ -96,3 +96,18 @@ void Bu::Filter::flush() | |||
96 | rNext.flush(); | 96 | rNext.flush(); |
97 | } | 97 | } |
98 | 98 | ||
99 | Bu::size Bu::Filter::getSize() const | ||
100 | { | ||
101 | return rNext.getSize(); | ||
102 | } | ||
103 | |||
104 | Bu::size Bu::Filter::getBlockSize() const | ||
105 | { | ||
106 | return rNext.getBlockSize(); | ||
107 | } | ||
108 | |||
109 | Bu::String Bu::Filter::getLocation() const | ||
110 | { | ||
111 | return rNext.getLocation(); | ||
112 | } | ||
113 | |||
diff --git a/src/filter.h b/src/filter.h index 5507daa..2c57805 100644 --- a/src/filter.h +++ b/src/filter.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -41,12 +41,12 @@ namespace Bu | |||
41 | virtual ~Filter(); | 41 | virtual ~Filter(); |
42 | 42 | ||
43 | virtual void start()=0; | 43 | virtual void start()=0; |
44 | virtual size_t stop()=0; | 44 | virtual Bu::size stop()=0; |
45 | virtual void close(); | 45 | virtual void close(); |
46 | virtual long tell(); | 46 | virtual Bu::size tell(); |
47 | virtual void seek( long offset ); | 47 | virtual void seek( Bu::size offset ); |
48 | virtual void setPos( long pos ); | 48 | virtual void setPos( Bu::size pos ); |
49 | virtual void setPosEnd( long pos ); | 49 | virtual void setPosEnd( Bu::size pos ); |
50 | virtual bool isEos(); | 50 | virtual bool isEos(); |
51 | virtual bool isOpen(); | 51 | virtual bool isOpen(); |
52 | 52 | ||
@@ -66,8 +66,12 @@ namespace Bu | |||
66 | * Most filters won't re-implement this, it doesn't make a lot of sense | 66 | * Most filters won't re-implement this, it doesn't make a lot of sense |
67 | * for filters, in general. | 67 | * for filters, in general. |
68 | */ | 68 | */ |
69 | virtual void setSize( long iSize ); | 69 | virtual void setSize( Bu::size iSize ); |
70 | 70 | ||
71 | virtual size getSize() const; | ||
72 | virtual size getBlockSize() const; | ||
73 | virtual Bu::String getLocation() const; | ||
74 | |||
71 | protected: | 75 | protected: |
72 | Bu::Stream &rNext; | 76 | Bu::Stream &rNext; |
73 | 77 | ||
diff --git a/src/formatter.cpp b/src/formatter.cpp index 9288e91..f73d46e 100644 --- a/src/formatter.cpp +++ b/src/formatter.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/formatter.h b/src/formatter.h index fb51c81..49507de 100644 --- a/src/formatter.h +++ b/src/formatter.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/formula.cpp b/src/formula.cpp index d8612eb..ac435ed 100644 --- a/src/formula.cpp +++ b/src/formula.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/formula.h b/src/formula.h index 757884f..687e6c3 100644 --- a/src/formula.h +++ b/src/formula.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/hash.cpp b/src/hash.cpp index a2052b8..59572ec 100644 --- a/src/hash.cpp +++ b/src/hash.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/heap.cpp b/src/heap.cpp index 0f959da..a2ffac2 100644 --- a/src/heap.cpp +++ b/src/heap.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/httpget.cpp b/src/httpget.cpp index 673cdd6..99492a2 100644 --- a/src/httpget.cpp +++ b/src/httpget.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -34,30 +34,30 @@ void Bu::HttpGet::get() | |||
34 | // sSrv.read( | 34 | // sSrv.read( |
35 | } | 35 | } |
36 | 36 | ||
37 | size_t Bu::HttpGet::read( void * /*pBuf*/, size_t /*nBytes*/ ) | 37 | Bu::size Bu::HttpGet::read( void * /*pBuf*/, Bu::size /*nBytes*/ ) |
38 | { | 38 | { |
39 | return 0; | 39 | return 0; |
40 | } | 40 | } |
41 | 41 | ||
42 | size_t Bu::HttpGet::write( const void * /*pBuf*/, size_t /*nBytes*/ ) | 42 | Bu::size Bu::HttpGet::write( const void * /*pBuf*/, Bu::size /*nBytes*/ ) |
43 | { | 43 | { |
44 | return 0; | 44 | return 0; |
45 | } | 45 | } |
46 | 46 | ||
47 | long Bu::HttpGet::tell() | 47 | Bu::size Bu::HttpGet::tell() |
48 | { | 48 | { |
49 | return 0; | 49 | return 0; |
50 | } | 50 | } |
51 | 51 | ||
52 | void Bu::HttpGet::seek( long ) | 52 | void Bu::HttpGet::seek( Bu::size ) |
53 | { | 53 | { |
54 | } | 54 | } |
55 | 55 | ||
56 | void Bu::HttpGet::setPos( long ) | 56 | void Bu::HttpGet::setPos( Bu::size ) |
57 | { | 57 | { |
58 | } | 58 | } |
59 | 59 | ||
60 | void Bu::HttpGet::setPosEnd( long ) | 60 | void Bu::HttpGet::setPosEnd( Bu::size ) |
61 | { | 61 | { |
62 | } | 62 | } |
63 | 63 | ||
@@ -109,3 +109,18 @@ void Bu::HttpGet::setBlocking( bool /*bBlocking*/ ) | |||
109 | { | 109 | { |
110 | } | 110 | } |
111 | 111 | ||
112 | Bu::size Bu::HttpGet::getSize() const | ||
113 | { | ||
114 | return 0; | ||
115 | } | ||
116 | |||
117 | Bu::size Bu::HttpGet::getBlockSize() const | ||
118 | { | ||
119 | return 0; | ||
120 | } | ||
121 | |||
122 | Bu::String Bu::HttpGet::getLocation() const | ||
123 | { | ||
124 | return uSrc.getUrl(); | ||
125 | } | ||
126 | |||
diff --git a/src/httpget.h b/src/httpget.h index 58982c0..a58e8ac 100644 --- a/src/httpget.h +++ b/src/httpget.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -26,14 +26,14 @@ namespace Bu | |||
26 | 26 | ||
27 | // From Bu::Stream | 27 | // From Bu::Stream |
28 | virtual void close(); | 28 | virtual void close(); |
29 | virtual size_t read( void *pBuf, size_t nBytes ); | 29 | virtual Bu::size read( void *pBuf, Bu::size nBytes ); |
30 | virtual size_t write( const void *pBuf, size_t nBytes ); | 30 | virtual Bu::size write( const void *pBuf, Bu::size nBytes ); |
31 | using Stream::write; | 31 | using Stream::write; |
32 | 32 | ||
33 | virtual long tell(); | 33 | virtual Bu::size tell(); |
34 | virtual void seek( long offset ); | 34 | virtual void seek( Bu::size offset ); |
35 | virtual void setPos( long pos ); | 35 | virtual void setPos( Bu::size pos ); |
36 | virtual void setPosEnd( long pos ); | 36 | virtual void setPosEnd( Bu::size pos ); |
37 | virtual bool isEos(); | 37 | virtual bool isEos(); |
38 | virtual bool isOpen(); | 38 | virtual bool isOpen(); |
39 | 39 | ||
@@ -49,6 +49,10 @@ namespace Bu | |||
49 | virtual bool isBlocking(); | 49 | virtual bool isBlocking(); |
50 | virtual void setBlocking( bool bBlocking=true ); | 50 | virtual void setBlocking( bool bBlocking=true ); |
51 | 51 | ||
52 | virtual size getSize() const; | ||
53 | virtual size getBlockSize() const; | ||
54 | virtual Bu::String getLocation() const; | ||
55 | |||
52 | private: | 56 | private: |
53 | Bu::Url uSrc; | 57 | Bu::Url uSrc; |
54 | Bu::String sMethod; | 58 | Bu::String sMethod; |
diff --git a/src/ito.cpp b/src/ito.cpp index 12aee6f..aa9a597 100644 --- a/src/ito.cpp +++ b/src/ito.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/itoatom.h b/src/itoatom.h index 20ef911..3659f4e 100644 --- a/src/itoatom.h +++ b/src/itoatom.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/itocondition.cpp b/src/itocondition.cpp index ddf8d0d..3d8db60 100644 --- a/src/itocondition.cpp +++ b/src/itocondition.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/itocondition.h b/src/itocondition.h index 6468728..88e8d6c 100644 --- a/src/itocondition.h +++ b/src/itocondition.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/itocounter.cpp b/src/itocounter.cpp index 9f71a77..0c6e06c 100644 --- a/src/itocounter.cpp +++ b/src/itocounter.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/itocounter.h b/src/itocounter.h index 6f52175..10df467 100644 --- a/src/itocounter.h +++ b/src/itocounter.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/itoheap.cpp b/src/itoheap.cpp index 546edea..21ccef8 100644 --- a/src/itoheap.cpp +++ b/src/itoheap.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/itoheap.h b/src/itoheap.h index 7fdbba3..a5aad05 100644 --- a/src/itoheap.h +++ b/src/itoheap.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/itomutex.cpp b/src/itomutex.cpp index 4c6ae4c..8de6336 100644 --- a/src/itomutex.cpp +++ b/src/itomutex.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/itomutex.h b/src/itomutex.h index 6cf08b4..68a0c1d 100644 --- a/src/itomutex.h +++ b/src/itomutex.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/itoqueue.h b/src/itoqueue.h index 6801c91..dc3cadb 100644 --- a/src/itoqueue.h +++ b/src/itoqueue.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/itoserver.cpp b/src/itoserver.cpp index 80e5bfb..9f03417 100644 --- a/src/itoserver.cpp +++ b/src/itoserver.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/itoserver.h b/src/itoserver.h index 83e7552..902c684 100644 --- a/src/itoserver.h +++ b/src/itoserver.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/lexer.cpp b/src/lexer.cpp index 5db6bbc..7dc2b23 100644 --- a/src/lexer.cpp +++ b/src/lexer.cpp | |||
@@ -1,3 +1,10 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. | ||
3 | * | ||
4 | * This file is part of the libbu++ library and is released under the | ||
5 | * terms of the license contained in the file LICENSE. | ||
6 | */ | ||
7 | |||
1 | #include "bu/lexer.h" | 8 | #include "bu/lexer.h" |
2 | 9 | ||
3 | Bu::Lexer::Lexer() | 10 | Bu::Lexer::Lexer() |
diff --git a/src/lexer.h b/src/lexer.h index f4e0479..b057692 100644 --- a/src/lexer.h +++ b/src/lexer.h | |||
@@ -1,3 +1,10 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. | ||
3 | * | ||
4 | * This file is part of the libbu++ library and is released under the | ||
5 | * terms of the license contained in the file LICENSE. | ||
6 | */ | ||
7 | |||
1 | #ifndef BU_LEXER_H | 8 | #ifndef BU_LEXER_H |
2 | #define BU_LEXER_H | 9 | #define BU_LEXER_H |
3 | 10 | ||
diff --git a/src/linkmessage.cpp b/src/linkmessage.cpp index 55e5026..cd024c0 100644 --- a/src/linkmessage.cpp +++ b/src/linkmessage.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/linkmessage.h b/src/linkmessage.h index 3c966df..69423b3 100644 --- a/src/linkmessage.h +++ b/src/linkmessage.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/list.cpp b/src/list.cpp index cbd6929..e05765e 100644 --- a/src/list.cpp +++ b/src/list.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/logger.cpp b/src/logger.cpp index eb5ac2d..8e46390 100644 --- a/src/logger.cpp +++ b/src/logger.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/logger.h b/src/logger.h index 9a4b030..5c1352b 100644 --- a/src/logger.h +++ b/src/logger.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/md5.cpp b/src/md5.cpp index db70ddc..f971f23 100644 --- a/src/md5.cpp +++ b/src/md5.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/membuf.cpp b/src/membuf.cpp index 2dc266f..14d0d58 100644 --- a/src/membuf.cpp +++ b/src/membuf.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -149,6 +149,21 @@ void Bu::MemBuf::setSize( size iSize ) | |||
149 | nPos = iSize; | 149 | nPos = iSize; |
150 | } | 150 | } |
151 | 151 | ||
152 | Bu::size Bu::MemBuf::getSize() const | ||
153 | { | ||
154 | return sBuf.getSize(); | ||
155 | } | ||
156 | |||
157 | Bu::size Bu::MemBuf::getBlockSize() const | ||
158 | { | ||
159 | return sBuf.getSize(); | ||
160 | } | ||
161 | |||
162 | Bu::String Bu::MemBuf::getLocation() const | ||
163 | { | ||
164 | return ""; | ||
165 | } | ||
166 | |||
152 | Bu::String &Bu::MemBuf::getString() | 167 | Bu::String &Bu::MemBuf::getString() |
153 | { | 168 | { |
154 | return sBuf; | 169 | return sBuf; |
diff --git a/src/membuf.h b/src/membuf.h index 7faa956..d98a29c 100644 --- a/src/membuf.h +++ b/src/membuf.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -47,6 +47,9 @@ namespace Bu | |||
47 | virtual bool isBlocking(); | 47 | virtual bool isBlocking(); |
48 | virtual void setBlocking( bool bBlocking=true ); | 48 | virtual void setBlocking( bool bBlocking=true ); |
49 | virtual void setSize( size iSize ); | 49 | virtual void setSize( size iSize ); |
50 | virtual size getSize() const; | ||
51 | virtual size getBlockSize() const; | ||
52 | virtual Bu::String getLocation() const; | ||
50 | 53 | ||
51 | Bu::String &getString(); | 54 | Bu::String &getString(); |
52 | void setString( const Bu::String &sNewData ); | 55 | void setString( const Bu::String &sNewData ); |
diff --git a/src/minicron.cpp b/src/minicron.cpp index 307880e..3375492 100644 --- a/src/minicron.cpp +++ b/src/minicron.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/minicron.h b/src/minicron.h index 42369f5..7ccf543 100644 --- a/src/minicron.h +++ b/src/minicron.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/minimacro.cpp b/src/minimacro.cpp index 6c5a7c9..b6fd6a8 100644 --- a/src/minimacro.cpp +++ b/src/minimacro.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/minimacro.h b/src/minimacro.h index 0483190..582e1b0 100644 --- a/src/minimacro.h +++ b/src/minimacro.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/multiserver.cpp b/src/multiserver.cpp index 58f2a7c..bd598ed 100644 --- a/src/multiserver.cpp +++ b/src/multiserver.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/multiserver.h b/src/multiserver.h index d529d0c..e3b3ec3 100644 --- a/src/multiserver.h +++ b/src/multiserver.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/myriad.cpp b/src/myriad.cpp index b656b52..0e8dc80 100644 --- a/src/myriad.cpp +++ b/src/myriad.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/myriad.h b/src/myriad.h index 582d310..86c7aa1 100644 --- a/src/myriad.h +++ b/src/myriad.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/myriadfs.cpp b/src/myriadfs.cpp index af60c08..9f68253 100644 --- a/src/myriadfs.cpp +++ b/src/myriadfs.cpp | |||
@@ -1,3 +1,10 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. | ||
3 | * | ||
4 | * This file is part of the libbu++ library and is released under the | ||
5 | * terms of the license contained in the file LICENSE. | ||
6 | */ | ||
7 | |||
1 | #include "bu/myriadfs.h" | 8 | #include "bu/myriadfs.h" |
2 | #include "bu/myriadstream.h" | 9 | #include "bu/myriadstream.h" |
3 | 10 | ||
diff --git a/src/myriadfs.h b/src/myriadfs.h index 42a3493..edbdaf5 100644 --- a/src/myriadfs.h +++ b/src/myriadfs.h | |||
@@ -1,3 +1,10 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. | ||
3 | * | ||
4 | * This file is part of the libbu++ library and is released under the | ||
5 | * terms of the license contained in the file LICENSE. | ||
6 | */ | ||
7 | |||
1 | #ifndef MYRIAD_FS_H | 8 | #ifndef MYRIAD_FS_H |
2 | #define MYRIAD_FS_H | 9 | #define MYRIAD_FS_H |
3 | 10 | ||
diff --git a/src/myriadstream.cpp b/src/myriadstream.cpp index 74dca04..a968a0c 100644 --- a/src/myriadstream.cpp +++ b/src/myriadstream.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -46,13 +46,13 @@ void Bu::MyriadStream::close() | |||
46 | { | 46 | { |
47 | } | 47 | } |
48 | 48 | ||
49 | size_t Bu::MyriadStream::read( void *pBuf, size_t nBytes ) | 49 | Bu::size Bu::MyriadStream::read( void *pBuf, Bu::size nBytes ) |
50 | { | 50 | { |
51 | #ifdef MYRIAD_STREAM_DEBUG | 51 | #ifdef MYRIAD_STREAM_DEBUG |
52 | sio << "MyriadStream: read: " << __LINE__ << ": Started, asked to read " << nBytes << "b." | 52 | sio << "MyriadStream: read: " << __LINE__ << ": Started, asked to read " << nBytes << "b." |
53 | << sio.nl; | 53 | << sio.nl; |
54 | #endif | 54 | #endif |
55 | if( nBytes > (size_t)pStream->iSize-iPos ) | 55 | if( nBytes > (Bu::size)pStream->iSize-iPos ) |
56 | nBytes = pStream->iSize-iPos; | 56 | nBytes = pStream->iSize-iPos; |
57 | if( nBytes <= 0 ) | 57 | if( nBytes <= 0 ) |
58 | return 0; | 58 | return 0; |
@@ -109,7 +109,7 @@ size_t Bu::MyriadStream::read( void *pBuf, size_t nBytes ) | |||
109 | return nBytes; | 109 | return nBytes; |
110 | } | 110 | } |
111 | 111 | ||
112 | size_t Bu::MyriadStream::write( const void *pBuf, size_t nBytes ) | 112 | Bu::size Bu::MyriadStream::write( const void *pBuf, Bu::size nBytes ) |
113 | { | 113 | { |
114 | if( nBytes <= 0 ) | 114 | if( nBytes <= 0 ) |
115 | return 0; | 115 | return 0; |
@@ -215,22 +215,22 @@ size_t Bu::MyriadStream::write( const void *pBuf, size_t nBytes ) | |||
215 | return nBytes; | 215 | return nBytes; |
216 | } | 216 | } |
217 | 217 | ||
218 | long Bu::MyriadStream::tell() | 218 | Bu::size Bu::MyriadStream::tell() |
219 | { | 219 | { |
220 | return iPos; | 220 | return iPos; |
221 | } | 221 | } |
222 | 222 | ||
223 | void Bu::MyriadStream::seek( long offset ) | 223 | void Bu::MyriadStream::seek( Bu::size offset ) |
224 | { | 224 | { |
225 | iPos += offset; | 225 | iPos += offset; |
226 | } | 226 | } |
227 | 227 | ||
228 | void Bu::MyriadStream::setPos( long pos ) | 228 | void Bu::MyriadStream::setPos( Bu::size pos ) |
229 | { | 229 | { |
230 | iPos = pos; | 230 | iPos = pos; |
231 | } | 231 | } |
232 | 232 | ||
233 | void Bu::MyriadStream::setPosEnd( long pos ) | 233 | void Bu::MyriadStream::setPosEnd( Bu::size pos ) |
234 | { | 234 | { |
235 | iPos = pStream->iSize-pos; | 235 | iPos = pStream->iSize-pos; |
236 | } | 236 | } |
@@ -283,7 +283,7 @@ void Bu::MyriadStream::setBlocking( bool /*bBlocking*/ ) | |||
283 | { | 283 | { |
284 | } | 284 | } |
285 | 285 | ||
286 | void Bu::MyriadStream::setSize( long iSize ) | 286 | void Bu::MyriadStream::setSize( Bu::size iSize ) |
287 | { | 287 | { |
288 | if( iSize < 0 ) | 288 | if( iSize < 0 ) |
289 | iSize = 0; | 289 | iSize = 0; |
@@ -292,3 +292,20 @@ void Bu::MyriadStream::setSize( long iSize ) | |||
292 | iPos = iSize; | 292 | iPos = iSize; |
293 | } | 293 | } |
294 | 294 | ||
295 | Bu::size Bu::MyriadStream::getSize() const | ||
296 | { | ||
297 | return pStream->iSize; | ||
298 | } | ||
299 | |||
300 | Bu::size Bu::MyriadStream::getBlockSize() const | ||
301 | { | ||
302 | return rMyriad.getBlockSize(); | ||
303 | } | ||
304 | |||
305 | Bu::String Bu::MyriadStream::getLocation() const | ||
306 | { | ||
307 | Bu::String s; | ||
308 | s.format("%d", pStream->iId ); | ||
309 | return s; | ||
310 | } | ||
311 | |||
diff --git a/src/myriadstream.h b/src/myriadstream.h index 1a5e552..fdad669 100644 --- a/src/myriadstream.h +++ b/src/myriadstream.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -26,13 +26,13 @@ namespace Bu | |||
26 | virtual ~MyriadStream(); | 26 | virtual ~MyriadStream(); |
27 | 27 | ||
28 | virtual void close(); | 28 | virtual void close(); |
29 | virtual size_t read( void *pBuf, size_t nBytes ); | 29 | virtual Bu::size read( void *pBuf, Bu::size nBytes ); |
30 | virtual size_t write( const void *pBuf, size_t nBytes ); | 30 | virtual Bu::size write( const void *pBuf, Bu::size nBytes ); |
31 | using Stream::write; | 31 | using Stream::write; |
32 | virtual long tell(); | 32 | virtual Bu::size tell(); |
33 | virtual void seek( long offset ); | 33 | virtual void seek( Bu::size offset ); |
34 | virtual void setPos( long pos ); | 34 | virtual void setPos( Bu::size pos ); |
35 | virtual void setPosEnd( long pos ); | 35 | virtual void setPosEnd( Bu::size pos ); |
36 | virtual bool isEos(); | 36 | virtual bool isEos(); |
37 | virtual bool isOpen(); | 37 | virtual bool isOpen(); |
38 | virtual void flush(); | 38 | virtual void flush(); |
@@ -43,7 +43,11 @@ namespace Bu | |||
43 | virtual bool isSeekable(); | 43 | virtual bool isSeekable(); |
44 | virtual bool isBlocking(); | 44 | virtual bool isBlocking(); |
45 | virtual void setBlocking( bool bBlocking=true ); | 45 | virtual void setBlocking( bool bBlocking=true ); |
46 | virtual void setSize( long iSize ); | 46 | virtual void setSize( Bu::size iSize ); |
47 | |||
48 | virtual size getSize() const; | ||
49 | virtual size getBlockSize() const; | ||
50 | virtual Bu::String getLocation() const; | ||
47 | 51 | ||
48 | private: | 52 | private: |
49 | Myriad &rMyriad; | 53 | Myriad &rMyriad; |
diff --git a/src/newline.cpp b/src/newline.cpp index 8c5d3d5..ffc9eb0 100644 --- a/src/newline.cpp +++ b/src/newline.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -21,19 +21,19 @@ void Bu::NewLine::start() | |||
21 | { | 21 | { |
22 | } | 22 | } |
23 | 23 | ||
24 | size_t Bu::NewLine::stop() | 24 | Bu::size Bu::NewLine::stop() |
25 | { | 25 | { |
26 | return 0; | 26 | return 0; |
27 | } | 27 | } |
28 | 28 | ||
29 | size_t Bu::NewLine::read( void *pBufV, size_t iAmnt ) | 29 | Bu::size Bu::NewLine::read( void *pBufV, Bu::size iAmnt ) |
30 | { | 30 | { |
31 | size_t iTotal = 0; | 31 | Bu::size iTotal = 0; |
32 | size_t iOffset = 0; | 32 | Bu::size iOffset = 0; |
33 | size_t iRead = rNext.read( pBufV, iAmnt ); | 33 | Bu::size iRead = rNext.read( pBufV, iAmnt ); |
34 | char *pBuf = (char *)pBufV; | 34 | char *pBuf = (char *)pBufV; |
35 | 35 | ||
36 | for( size_t i = 0; i < iRead; i++ ) | 36 | for( Bu::size i = 0; i < iRead; i++ ) |
37 | { | 37 | { |
38 | if( pBuf[i] == '\r' ) | 38 | if( pBuf[i] == '\r' ) |
39 | { | 39 | { |
@@ -61,7 +61,7 @@ size_t Bu::NewLine::read( void *pBufV, size_t iAmnt ) | |||
61 | return iTotal; | 61 | return iTotal; |
62 | } | 62 | } |
63 | 63 | ||
64 | size_t Bu::NewLine::write( const void *, size_t ) | 64 | Bu::size Bu::NewLine::write( const void *, Bu::size ) |
65 | { | 65 | { |
66 | return 0; | 66 | return 0; |
67 | } | 67 | } |
diff --git a/src/newline.h b/src/newline.h index 243c876..afe0a84 100644 --- a/src/newline.h +++ b/src/newline.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -27,10 +27,10 @@ namespace Bu | |||
27 | virtual ~NewLine(); | 27 | virtual ~NewLine(); |
28 | 28 | ||
29 | virtual void start(); | 29 | virtual void start(); |
30 | virtual size_t stop(); | 30 | virtual Bu::size stop(); |
31 | 31 | ||
32 | virtual size_t read( void *pBuf, size_t iAmnt ); | 32 | virtual Bu::size read( void *pBuf, Bu::size iAmnt ); |
33 | virtual size_t write( const void *pBuf, size_t iAmnt ); | 33 | virtual Bu::size write( const void *pBuf, Bu::size iAmnt ); |
34 | 34 | ||
35 | private: | 35 | private: |
36 | bool bExChar; | 36 | bool bExChar; |
diff --git a/src/nullstream.cpp b/src/nullstream.cpp index 6f792e3..9552cc5 100644 --- a/src/nullstream.cpp +++ b/src/nullstream.cpp | |||
@@ -1,3 +1,10 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. | ||
3 | * | ||
4 | * This file is part of the libbu++ library and is released under the | ||
5 | * terms of the license contained in the file LICENSE. | ||
6 | */ | ||
7 | |||
1 | #include "bu/nullstream.h" | 8 | #include "bu/nullstream.h" |
2 | 9 | ||
3 | Bu::NullStream::NullStream() : | 10 | Bu::NullStream::NullStream() : |
@@ -15,7 +22,7 @@ void Bu::NullStream::close() | |||
15 | sRead = sWrote = 0; | 22 | sRead = sWrote = 0; |
16 | } | 23 | } |
17 | 24 | ||
18 | size_t Bu::NullStream::read( void *pBuf, size_t nBytes ) | 25 | Bu::size Bu::NullStream::read( void *pBuf, Bu::size nBytes ) |
19 | { | 26 | { |
20 | memset( pBuf, 0, nBytes ); | 27 | memset( pBuf, 0, nBytes ); |
21 | sRead += nBytes; | 28 | sRead += nBytes; |
@@ -28,26 +35,26 @@ Bu::String Bu::NullStream::readLine() | |||
28 | return Bu::String("\0", 1 ); | 35 | return Bu::String("\0", 1 ); |
29 | } | 36 | } |
30 | 37 | ||
31 | size_t Bu::NullStream::write( const void *, size_t nBytes ) | 38 | Bu::size Bu::NullStream::write( const void *, Bu::size nBytes ) |
32 | { | 39 | { |
33 | sWrote += nBytes; | 40 | sWrote += nBytes; |
34 | return nBytes; | 41 | return nBytes; |
35 | } | 42 | } |
36 | 43 | ||
37 | long Bu::NullStream::tell() | 44 | Bu::size Bu::NullStream::tell() |
38 | { | 45 | { |
39 | return sRead + sWrote; | 46 | return sRead + sWrote; |
40 | } | 47 | } |
41 | 48 | ||
42 | void Bu::NullStream::seek( long ) | 49 | void Bu::NullStream::seek( Bu::size ) |
43 | { | 50 | { |
44 | } | 51 | } |
45 | 52 | ||
46 | void Bu::NullStream::setPos( long ) | 53 | void Bu::NullStream::setPos( Bu::size ) |
47 | { | 54 | { |
48 | } | 55 | } |
49 | 56 | ||
50 | void Bu::NullStream::setPosEnd( long ) | 57 | void Bu::NullStream::setPosEnd( Bu::size ) |
51 | { | 58 | { |
52 | } | 59 | } |
53 | 60 | ||
@@ -99,7 +106,22 @@ void Bu::NullStream::setBlocking( bool ) | |||
99 | { | 106 | { |
100 | } | 107 | } |
101 | 108 | ||
102 | void Bu::NullStream::setSize( long ) | 109 | void Bu::NullStream::setSize( Bu::size ) |
110 | { | ||
111 | } | ||
112 | |||
113 | Bu::size Bu::NullStream::getSize() const | ||
114 | { | ||
115 | return 0; | ||
116 | } | ||
117 | |||
118 | Bu::size Bu::NullStream::getBlockSize() const | ||
119 | { | ||
120 | return 0; | ||
121 | } | ||
122 | |||
123 | Bu::String Bu::NullStream::getLocation() const | ||
103 | { | 124 | { |
125 | return ""; | ||
104 | } | 126 | } |
105 | 127 | ||
diff --git a/src/nullstream.h b/src/nullstream.h index 8c1f744..9b75332 100644 --- a/src/nullstream.h +++ b/src/nullstream.h | |||
@@ -1,3 +1,10 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. | ||
3 | * | ||
4 | * This file is part of the libbu++ library and is released under the | ||
5 | * terms of the license contained in the file LICENSE. | ||
6 | */ | ||
7 | |||
1 | #ifndef BU_NULL_STREAM_H | 8 | #ifndef BU_NULL_STREAM_H |
2 | #define BU_NULL_STREAM_H | 9 | #define BU_NULL_STREAM_H |
3 | 10 | ||
@@ -24,14 +31,14 @@ namespace Bu | |||
24 | virtual ~NullStream(); | 31 | virtual ~NullStream(); |
25 | 32 | ||
26 | virtual void close(); | 33 | virtual void close(); |
27 | virtual size_t read( void *pBuf, size_t nBytes ); | 34 | virtual Bu::size read( void *pBuf, Bu::size nBytes ); |
28 | virtual Bu::String readLine(); | 35 | virtual Bu::String readLine(); |
29 | virtual size_t write( const void *pBuf, size_t nBytes ); | 36 | virtual Bu::size write( const void *pBuf, Bu::size nBytes ); |
30 | using Bu::Stream::write; | 37 | using Bu::Stream::write; |
31 | virtual long tell(); | 38 | virtual Bu::size tell(); |
32 | virtual void seek( long offset ); | 39 | virtual void seek( Bu::size offset ); |
33 | virtual void setPos( long pos ); | 40 | virtual void setPos( Bu::size pos ); |
34 | virtual void setPosEnd( long pos ); | 41 | virtual void setPosEnd( Bu::size pos ); |
35 | virtual bool isEos(); | 42 | virtual bool isEos(); |
36 | virtual bool isOpen(); | 43 | virtual bool isOpen(); |
37 | virtual void flush(); | 44 | virtual void flush(); |
@@ -42,14 +49,18 @@ namespace Bu | |||
42 | virtual bool isSeekable(); | 49 | virtual bool isSeekable(); |
43 | virtual bool isBlocking(); | 50 | virtual bool isBlocking(); |
44 | virtual void setBlocking( bool bBlocking=true ); | 51 | virtual void setBlocking( bool bBlocking=true ); |
45 | virtual void setSize( long iSize ); | 52 | virtual void setSize( Bu::size iSize ); |
53 | |||
54 | virtual size getSize() const; | ||
55 | virtual size getBlockSize() const; | ||
56 | virtual Bu::String getLocation() const; | ||
46 | 57 | ||
47 | size_t getBytesRead() { return sRead; } | 58 | Bu::size getBytesRead() { return sRead; } |
48 | size_t getByetsWritten() { return sWrote; } | 59 | Bu::size getByetsWritten() { return sWrote; } |
49 | 60 | ||
50 | private: | 61 | private: |
51 | size_t sRead; | 62 | Bu::size sRead; |
52 | size_t sWrote; | 63 | Bu::size sWrote; |
53 | }; | 64 | }; |
54 | }; | 65 | }; |
55 | 66 | ||
diff --git a/src/optparser.cpp b/src/optparser.cpp index 7b4e0d0..bab93d0 100644 --- a/src/optparser.cpp +++ b/src/optparser.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/optparser.h b/src/optparser.h index 9781542..4142e22 100644 --- a/src/optparser.h +++ b/src/optparser.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/parser.cpp b/src/parser.cpp index e46967c..4d9f793 100644 --- a/src/parser.cpp +++ b/src/parser.cpp | |||
@@ -1,3 +1,10 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. | ||
3 | * | ||
4 | * This file is part of the libbu++ library and is released under the | ||
5 | * terms of the license contained in the file LICENSE. | ||
6 | */ | ||
7 | |||
1 | #include "bu/parser.h" | 8 | #include "bu/parser.h" |
2 | #include "bu/lexer.h" | 9 | #include "bu/lexer.h" |
3 | 10 | ||
diff --git a/src/parser.h b/src/parser.h index f4c4a74..a168c7b 100644 --- a/src/parser.h +++ b/src/parser.h | |||
@@ -1,3 +1,10 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. | ||
3 | * | ||
4 | * This file is part of the libbu++ library and is released under the | ||
5 | * terms of the license contained in the file LICENSE. | ||
6 | */ | ||
7 | |||
1 | #ifndef BU_PARSER_H | 8 | #ifndef BU_PARSER_H |
2 | #define BU_PARSER_H | 9 | #define BU_PARSER_H |
3 | 10 | ||
diff --git a/src/plugger.cpp b/src/plugger.cpp index e424f9c..6e49b4e 100644 --- a/src/plugger.cpp +++ b/src/plugger.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/plugger.h b/src/plugger.h index ef0cb53..65ac4bb 100644 --- a/src/plugger.h +++ b/src/plugger.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/process.cpp b/src/process.cpp index 0e3e93a..8ea6ce3 100644 --- a/src/process.cpp +++ b/src/process.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -133,7 +133,7 @@ void Bu::Process::close() | |||
133 | } | 133 | } |
134 | } | 134 | } |
135 | 135 | ||
136 | size_t Bu::Process::read( void *pBuf, size_t nBytes ) | 136 | Bu::size Bu::Process::read( void *pBuf, Bu::size nBytes ) |
137 | { | 137 | { |
138 | if( bStdOutEos ) | 138 | if( bStdOutEos ) |
139 | return 0; | 139 | return 0; |
@@ -145,7 +145,7 @@ size_t Bu::Process::read( void *pBuf, size_t nBytes ) | |||
145 | throw Bu::ExceptionBase( strerror( errno ) ); | 145 | throw Bu::ExceptionBase( strerror( errno ) ); |
146 | if( FD_ISSET( iStdOut, &rfds ) || bBlocking ) | 146 | if( FD_ISSET( iStdOut, &rfds ) || bBlocking ) |
147 | { | 147 | { |
148 | ssize_t nRead = TEMP_FAILURE_RETRY( ::read( iStdOut, pBuf, nBytes ) ); | 148 | Bu::size nRead = TEMP_FAILURE_RETRY( ::read( iStdOut, pBuf, nBytes ) ); |
149 | if( nRead == 0 ) | 149 | if( nRead == 0 ) |
150 | { | 150 | { |
151 | bStdOutEos = true; | 151 | bStdOutEos = true; |
@@ -163,7 +163,7 @@ size_t Bu::Process::read( void *pBuf, size_t nBytes ) | |||
163 | return 0; | 163 | return 0; |
164 | } | 164 | } |
165 | 165 | ||
166 | size_t Bu::Process::readErr( void *pBuf, size_t nBytes ) | 166 | Bu::size Bu::Process::readErr( void *pBuf, Bu::size nBytes ) |
167 | { | 167 | { |
168 | if( bStdErrEos ) | 168 | if( bStdErrEos ) |
169 | return 0; | 169 | return 0; |
@@ -175,7 +175,7 @@ size_t Bu::Process::readErr( void *pBuf, size_t nBytes ) | |||
175 | throw Bu::ExceptionBase( strerror( errno ) ); | 175 | throw Bu::ExceptionBase( strerror( errno ) ); |
176 | if( FD_ISSET( iStdErr, &rfds ) || bBlocking ) | 176 | if( FD_ISSET( iStdErr, &rfds ) || bBlocking ) |
177 | { | 177 | { |
178 | ssize_t nRead = TEMP_FAILURE_RETRY( ::read( iStdErr, pBuf, nBytes ) ); | 178 | Bu::size nRead = TEMP_FAILURE_RETRY( ::read( iStdErr, pBuf, nBytes ) ); |
179 | if( nRead == 0 ) | 179 | if( nRead == 0 ) |
180 | { | 180 | { |
181 | bStdErrEos = true; | 181 | bStdErrEos = true; |
@@ -193,25 +193,25 @@ size_t Bu::Process::readErr( void *pBuf, size_t nBytes ) | |||
193 | return 0; | 193 | return 0; |
194 | } | 194 | } |
195 | 195 | ||
196 | size_t Bu::Process::write( const void *pBuf, size_t nBytes ) | 196 | Bu::size Bu::Process::write( const void *pBuf, Bu::size nBytes ) |
197 | { | 197 | { |
198 | return TEMP_FAILURE_RETRY( ::write( iStdIn, pBuf, nBytes ) ); | 198 | return TEMP_FAILURE_RETRY( ::write( iStdIn, pBuf, nBytes ) ); |
199 | } | 199 | } |
200 | 200 | ||
201 | long Bu::Process::tell() | 201 | Bu::size Bu::Process::tell() |
202 | { | 202 | { |
203 | return 0; | 203 | return 0; |
204 | } | 204 | } |
205 | 205 | ||
206 | void Bu::Process::seek( long ) | 206 | void Bu::Process::seek( Bu::size ) |
207 | { | 207 | { |
208 | } | 208 | } |
209 | 209 | ||
210 | void Bu::Process::setPos( long ) | 210 | void Bu::Process::setPos( Bu::size ) |
211 | { | 211 | { |
212 | } | 212 | } |
213 | 213 | ||
214 | void Bu::Process::setPosEnd( long ) | 214 | void Bu::Process::setPosEnd( Bu::size ) |
215 | { | 215 | { |
216 | } | 216 | } |
217 | 217 | ||
@@ -278,10 +278,25 @@ void Bu::Process::setBlocking( bool bBlocking ) | |||
278 | this->bBlocking = bBlocking; | 278 | this->bBlocking = bBlocking; |
279 | } | 279 | } |
280 | 280 | ||
281 | void Bu::Process::setSize( long ) | 281 | void Bu::Process::setSize( Bu::size ) |
282 | { | 282 | { |
283 | } | 283 | } |
284 | 284 | ||
285 | Bu::size Bu::Process::getBlockSize() const | ||
286 | { | ||
287 | return 0; | ||
288 | } | ||
289 | |||
290 | Bu::size Bu::Process::getSize() const | ||
291 | { | ||
292 | return 0; | ||
293 | } | ||
294 | |||
295 | Bu::String Bu::Process::getLocation() const | ||
296 | { | ||
297 | return ""; | ||
298 | } | ||
299 | |||
285 | void Bu::Process::select( bool &bStdOut, bool &bStdErr ) | 300 | void Bu::Process::select( bool &bStdOut, bool &bStdErr ) |
286 | { | 301 | { |
287 | fd_set rfds; | 302 | fd_set rfds; |
diff --git a/src/process.h b/src/process.h index d787854..4934408 100644 --- a/src/process.h +++ b/src/process.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -44,15 +44,15 @@ namespace Bu | |||
44 | void wait(); | 44 | void wait(); |
45 | 45 | ||
46 | virtual void close(); | 46 | virtual void close(); |
47 | virtual size_t read( void *pBuf, size_t nBytes ); | 47 | virtual Bu::size read( void *pBuf, Bu::size nBytes ); |
48 | virtual size_t readErr( void *pBuf, size_t nBytes ); | 48 | virtual Bu::size readErr( void *pBuf, Bu::size nBytes ); |
49 | virtual size_t write( const void *pBuf, size_t nBytes ); | 49 | virtual Bu::size write( const void *pBuf, Bu::size nBytes ); |
50 | using Stream::write; | 50 | using Stream::write; |
51 | 51 | ||
52 | virtual long tell(); | 52 | virtual Bu::size tell(); |
53 | virtual void seek( long offset ); | 53 | virtual void seek( Bu::size offset ); |
54 | virtual void setPos( long pos ); | 54 | virtual void setPos( Bu::size pos ); |
55 | virtual void setPosEnd( long pos ); | 55 | virtual void setPosEnd( Bu::size pos ); |
56 | virtual bool isEos(); | 56 | virtual bool isEos(); |
57 | virtual bool isOpen(); | 57 | virtual bool isOpen(); |
58 | 58 | ||
@@ -68,7 +68,11 @@ namespace Bu | |||
68 | virtual bool isBlocking(); | 68 | virtual bool isBlocking(); |
69 | virtual void setBlocking( bool bBlocking=true ); | 69 | virtual void setBlocking( bool bBlocking=true ); |
70 | 70 | ||
71 | virtual void setSize( long iSize ); | 71 | virtual void setSize( Bu::size iSize ); |
72 | |||
73 | virtual size getBlockSize() const; | ||
74 | virtual size getSize() const; | ||
75 | virtual Bu::String getLocation() const; | ||
72 | 76 | ||
73 | void select( bool &bStdOut, bool &bStdErr ); | 77 | void select( bool &bStdOut, bool &bStdErr ); |
74 | 78 | ||
diff --git a/src/programchain.cpp b/src/programchain.cpp index a86cf5a..ce0c9cc 100644 --- a/src/programchain.cpp +++ b/src/programchain.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/programchain.h b/src/programchain.h index 6d1666c..47797a2 100644 --- a/src/programchain.h +++ b/src/programchain.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/programlink.cpp b/src/programlink.cpp index c1a4df0..f9453c2 100644 --- a/src/programlink.cpp +++ b/src/programlink.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/programlink.h b/src/programlink.h index dc5e7e7..36a605e 100644 --- a/src/programlink.h +++ b/src/programlink.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/protocol.cpp b/src/protocol.cpp index 7e992b4..2489d05 100644 --- a/src/protocol.cpp +++ b/src/protocol.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/protocol.h b/src/protocol.h index 28a70d0..0058723 100644 --- a/src/protocol.h +++ b/src/protocol.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/protocolhttp.cpp b/src/protocolhttp.cpp index 2fe447a..eaee9d0 100644 --- a/src/protocolhttp.cpp +++ b/src/protocolhttp.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/protocolhttp.h b/src/protocolhttp.h index 6f4af9b..153a00d 100644 --- a/src/protocolhttp.h +++ b/src/protocolhttp.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/protocoltelnet.cpp b/src/protocoltelnet.cpp index e07f275..7e37cca 100644 --- a/src/protocoltelnet.cpp +++ b/src/protocoltelnet.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/protocoltelnet.h b/src/protocoltelnet.h index e7a9af1..74d6478 100644 --- a/src/protocoltelnet.h +++ b/src/protocoltelnet.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/queue.cpp b/src/queue.cpp index c6486eb..9d6edac 100644 --- a/src/queue.cpp +++ b/src/queue.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/queue.h b/src/queue.h index bfb07e4..e5d9b5f 100644 --- a/src/queue.h +++ b/src/queue.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/queuebuf.cpp b/src/queuebuf.cpp index e8eb2ed..69abf4b 100644 --- a/src/queuebuf.cpp +++ b/src/queuebuf.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -37,7 +37,7 @@ void Bu::QueueBuf::close() | |||
37 | iReadOffset = iWriteOffset = iTotalSize = 0; | 37 | iReadOffset = iWriteOffset = iTotalSize = 0; |
38 | } | 38 | } |
39 | 39 | ||
40 | size_t Bu::QueueBuf::read( void *pRawBuf, size_t nBytes ) | 40 | Bu::size Bu::QueueBuf::read( void *pRawBuf, Bu::size nBytes ) |
41 | { | 41 | { |
42 | if( nBytes <= 0 ) | 42 | if( nBytes <= 0 ) |
43 | return 0; | 43 | return 0; |
@@ -45,7 +45,7 @@ size_t Bu::QueueBuf::read( void *pRawBuf, size_t nBytes ) | |||
45 | if( lBlocks.isEmpty() ) | 45 | if( lBlocks.isEmpty() ) |
46 | return 0; | 46 | return 0; |
47 | 47 | ||
48 | size_t iLeft = nBytes; | 48 | Bu::size iLeft = nBytes; |
49 | char *pBuf = (char *)pRawBuf; | 49 | char *pBuf = (char *)pRawBuf; |
50 | 50 | ||
51 | while( iLeft > 0 && iTotalSize > 0 ) | 51 | while( iLeft > 0 && iTotalSize > 0 ) |
@@ -60,7 +60,7 @@ size_t Bu::QueueBuf::read( void *pRawBuf, size_t nBytes ) | |||
60 | iReadOffset = 0; | 60 | iReadOffset = 0; |
61 | } | 61 | } |
62 | char *pBlock = lBlocks.first(); | 62 | char *pBlock = lBlocks.first(); |
63 | size_t iCopy = iBlockSize-iReadOffset; | 63 | Bu::size iCopy = iBlockSize-iReadOffset; |
64 | if( iLeft < iCopy ) | 64 | if( iLeft < iCopy ) |
65 | iCopy = iLeft; | 65 | iCopy = iLeft; |
66 | if( iTotalSize < iCopy ) | 66 | if( iTotalSize < iCopy ) |
@@ -76,12 +76,12 @@ size_t Bu::QueueBuf::read( void *pRawBuf, size_t nBytes ) | |||
76 | return nBytes - iLeft; | 76 | return nBytes - iLeft; |
77 | } | 77 | } |
78 | 78 | ||
79 | size_t Bu::QueueBuf::peek( void *pBuf, size_t nBytes ) | 79 | Bu::size Bu::QueueBuf::peek( void *pBuf, Bu::size nBytes ) |
80 | { | 80 | { |
81 | return peek( pBuf, nBytes, 0 ); | 81 | return peek( pBuf, nBytes, 0 ); |
82 | } | 82 | } |
83 | 83 | ||
84 | size_t Bu::QueueBuf::peek( void *pRawBuf, size_t nBytes, size_t nSkip ) | 84 | Bu::size Bu::QueueBuf::peek( void *pRawBuf, Bu::size nBytes, Bu::size nSkip ) |
85 | { | 85 | { |
86 | if( nBytes <= 0 ) | 86 | if( nBytes <= 0 ) |
87 | return 0; | 87 | return 0; |
@@ -89,11 +89,11 @@ size_t Bu::QueueBuf::peek( void *pRawBuf, size_t nBytes, size_t nSkip ) | |||
89 | if( lBlocks.isEmpty() ) | 89 | if( lBlocks.isEmpty() ) |
90 | return 0; | 90 | return 0; |
91 | 91 | ||
92 | size_t iLeft = nBytes; | 92 | Bu::size iLeft = nBytes; |
93 | char *pBuf = (char *)pRawBuf; | 93 | char *pBuf = (char *)pRawBuf; |
94 | 94 | ||
95 | int iTmpReadOffset = iReadOffset + nSkip; | 95 | int iTmpReadOffset = iReadOffset + nSkip; |
96 | size_t iTmpRemSize = iTotalSize; | 96 | Bu::size iTmpRemSize = iTotalSize; |
97 | BlockList::iterator iBlock = lBlocks.begin(); | 97 | BlockList::iterator iBlock = lBlocks.begin(); |
98 | while( iTmpReadOffset > iBlockSize ) | 98 | while( iTmpReadOffset > iBlockSize ) |
99 | { | 99 | { |
@@ -112,7 +112,7 @@ size_t Bu::QueueBuf::peek( void *pRawBuf, size_t nBytes, size_t nSkip ) | |||
112 | iTmpReadOffset = 0; | 112 | iTmpReadOffset = 0; |
113 | } | 113 | } |
114 | char *pBlock = *iBlock; | 114 | char *pBlock = *iBlock; |
115 | size_t iCopy = iBlockSize-iTmpReadOffset; | 115 | Bu::size iCopy = iBlockSize-iTmpReadOffset; |
116 | if( iLeft < iCopy ) | 116 | if( iLeft < iCopy ) |
117 | iCopy = iLeft; | 117 | iCopy = iLeft; |
118 | if( iTmpRemSize < iCopy ) | 118 | if( iTmpRemSize < iCopy ) |
@@ -129,7 +129,7 @@ size_t Bu::QueueBuf::peek( void *pRawBuf, size_t nBytes, size_t nSkip ) | |||
129 | return nBytes - iLeft; | 129 | return nBytes - iLeft; |
130 | } | 130 | } |
131 | 131 | ||
132 | size_t Bu::QueueBuf::write( const void *pRawBuf, size_t nBytes ) | 132 | Bu::size Bu::QueueBuf::write( const void *pRawBuf, Bu::size nBytes ) |
133 | { | 133 | { |
134 | if( nBytes <= 0 ) | 134 | if( nBytes <= 0 ) |
135 | return 0; | 135 | return 0; |
@@ -139,7 +139,7 @@ size_t Bu::QueueBuf::write( const void *pRawBuf, size_t nBytes ) | |||
139 | addBlock(); | 139 | addBlock(); |
140 | iWriteOffset = 0; | 140 | iWriteOffset = 0; |
141 | } | 141 | } |
142 | size_t iLeft = nBytes; | 142 | Bu::size iLeft = nBytes; |
143 | const char *pBuf = (const char *)pRawBuf; | 143 | const char *pBuf = (const char *)pRawBuf; |
144 | 144 | ||
145 | while( iLeft > 0 ) | 145 | while( iLeft > 0 ) |
@@ -150,7 +150,7 @@ size_t Bu::QueueBuf::write( const void *pRawBuf, size_t nBytes ) | |||
150 | iWriteOffset = 0; | 150 | iWriteOffset = 0; |
151 | } | 151 | } |
152 | char *pBlock = lBlocks.last(); | 152 | char *pBlock = lBlocks.last(); |
153 | size_t iCopy = iBlockSize-iWriteOffset; | 153 | Bu::size iCopy = iBlockSize-iWriteOffset; |
154 | if( iLeft < iCopy ) | 154 | if( iLeft < iCopy ) |
155 | iCopy = iLeft; | 155 | iCopy = iLeft; |
156 | memcpy( pBlock+iWriteOffset, pBuf, iCopy ); | 156 | memcpy( pBlock+iWriteOffset, pBuf, iCopy ); |
@@ -165,17 +165,17 @@ size_t Bu::QueueBuf::write( const void *pRawBuf, size_t nBytes ) | |||
165 | return nBytes; | 165 | return nBytes; |
166 | } | 166 | } |
167 | 167 | ||
168 | long Bu::QueueBuf::tell() | 168 | Bu::size Bu::QueueBuf::tell() |
169 | { | 169 | { |
170 | return -1; | 170 | return -1; |
171 | } | 171 | } |
172 | 172 | ||
173 | void Bu::QueueBuf::seek( long iAmnt ) | 173 | void Bu::QueueBuf::seek( Bu::size iAmnt ) |
174 | { | 174 | { |
175 | if( iAmnt <= 0 ) | 175 | if( iAmnt <= 0 ) |
176 | return; | 176 | return; |
177 | 177 | ||
178 | if( (size_t)iAmnt >= iTotalSize ) | 178 | if( (Bu::size)iAmnt >= iTotalSize ) |
179 | { | 179 | { |
180 | // sio << "seek: clear all data (" << iAmnt << ">=" << iTotalSize | 180 | // sio << "seek: clear all data (" << iAmnt << ">=" << iTotalSize |
181 | // << ")." << sio.nl; | 181 | // << ")." << sio.nl; |
@@ -193,11 +193,11 @@ void Bu::QueueBuf::seek( long iAmnt ) | |||
193 | } | 193 | } |
194 | } | 194 | } |
195 | 195 | ||
196 | void Bu::QueueBuf::setPos( long ) | 196 | void Bu::QueueBuf::setPos( Bu::size ) |
197 | { | 197 | { |
198 | } | 198 | } |
199 | 199 | ||
200 | void Bu::QueueBuf::setPosEnd( long ) | 200 | void Bu::QueueBuf::setPosEnd( Bu::size ) |
201 | { | 201 | { |
202 | } | 202 | } |
203 | 203 | ||
@@ -249,10 +249,25 @@ void Bu::QueueBuf::setBlocking( bool ) | |||
249 | { | 249 | { |
250 | } | 250 | } |
251 | 251 | ||
252 | void Bu::QueueBuf::setSize( long ) | 252 | void Bu::QueueBuf::setSize( Bu::size ) |
253 | { | 253 | { |
254 | } | 254 | } |
255 | 255 | ||
256 | Bu::size Bu::QueueBuf::getSize() const | ||
257 | { | ||
258 | return iTotalSize; | ||
259 | } | ||
260 | |||
261 | Bu::size Bu::QueueBuf::getBlockSize() const | ||
262 | { | ||
263 | return iBlockSize; | ||
264 | } | ||
265 | |||
266 | Bu::String Bu::QueueBuf::getLocation() const | ||
267 | { | ||
268 | return ""; | ||
269 | } | ||
270 | |||
256 | void Bu::QueueBuf::addBlock() | 271 | void Bu::QueueBuf::addBlock() |
257 | { | 272 | { |
258 | lBlocks.append( new char[iBlockSize] ); | 273 | lBlocks.append( new char[iBlockSize] ); |
diff --git a/src/queuebuf.h b/src/queuebuf.h index 395c6ba..84b50e1 100644 --- a/src/queuebuf.h +++ b/src/queuebuf.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -27,14 +27,14 @@ namespace Bu | |||
27 | int getSize(); | 27 | int getSize(); |
28 | 28 | ||
29 | virtual void close(); | 29 | virtual void close(); |
30 | virtual size_t read( void *pBuf, size_t nBytes ); | 30 | virtual Bu::size read( void *pBuf, Bu::size nBytes ); |
31 | virtual size_t peek( void *pBuf, size_t nBytes ); | 31 | virtual Bu::size peek( void *pBuf, Bu::size nBytes ); |
32 | virtual size_t peek( void *pBuf, size_t nBytes, size_t nSkip ); | 32 | virtual Bu::size peek( void *pBuf, Bu::size nBytes, Bu::size nSkip ); |
33 | virtual size_t write( const void *pBuf, size_t nBytes ); | 33 | virtual Bu::size write( const void *pBuf, Bu::size nBytes ); |
34 | virtual long tell(); | 34 | virtual Bu::size tell(); |
35 | virtual void seek( long offset ); | 35 | virtual void seek( Bu::size offset ); |
36 | virtual void setPos( long pos ); | 36 | virtual void setPos( Bu::size pos ); |
37 | virtual void setPosEnd( long pos ); | 37 | virtual void setPosEnd( Bu::size pos ); |
38 | virtual bool isEos(); | 38 | virtual bool isEos(); |
39 | virtual bool isOpen(); | 39 | virtual bool isOpen(); |
40 | virtual void flush(); | 40 | virtual void flush(); |
@@ -45,7 +45,11 @@ namespace Bu | |||
45 | virtual bool isSeekable(); | 45 | virtual bool isSeekable(); |
46 | virtual bool isBlocking(); | 46 | virtual bool isBlocking(); |
47 | virtual void setBlocking( bool bBlocking=true ); | 47 | virtual void setBlocking( bool bBlocking=true ); |
48 | virtual void setSize( long iSize ); | 48 | virtual void setSize( Bu::size iSize ); |
49 | |||
50 | virtual size getSize() const; | ||
51 | virtual size getBlockSize() const; | ||
52 | virtual Bu::String getLocation() const; | ||
49 | 53 | ||
50 | private: | 54 | private: |
51 | void addBlock(); | 55 | void addBlock(); |
@@ -55,7 +59,7 @@ namespace Bu | |||
55 | int iBlockSize; | 59 | int iBlockSize; |
56 | int iReadOffset; | 60 | int iReadOffset; |
57 | int iWriteOffset; | 61 | int iWriteOffset; |
58 | size_t iTotalSize; | 62 | Bu::size iTotalSize; |
59 | typedef Bu::List<char *> BlockList; | 63 | typedef Bu::List<char *> BlockList; |
60 | BlockList lBlocks; | 64 | BlockList lBlocks; |
61 | }; | 65 | }; |
diff --git a/src/regex.cpp b/src/regex.cpp index 8c28333..af0d364 100644 --- a/src/regex.cpp +++ b/src/regex.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/regex.h b/src/regex.h index 06b6352..f0aa5d5 100644 --- a/src/regex.h +++ b/src/regex.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/ringbuffer.cpp b/src/ringbuffer.cpp index 1dc603c..99b1b1c 100644 --- a/src/ringbuffer.cpp +++ b/src/ringbuffer.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/ringbuffer.h b/src/ringbuffer.h index f4fd58c..f43773d 100644 --- a/src/ringbuffer.h +++ b/src/ringbuffer.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/server.cpp b/src/server.cpp index 3348d3c..1972a3f 100644 --- a/src/server.cpp +++ b/src/server.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/server.h b/src/server.h index f22d01b..c59543a 100644 --- a/src/server.h +++ b/src/server.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/set.cpp b/src/set.cpp index f9937ef..e4e2849 100644 --- a/src/set.cpp +++ b/src/set.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/sha1.cpp b/src/sha1.cpp index f3e4eb1..bfe4c5a 100644 --- a/src/sha1.cpp +++ b/src/sha1.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/sharedcore.cpp b/src/sharedcore.cpp index 2c18872..75f92eb 100644 --- a/src/sharedcore.cpp +++ b/src/sharedcore.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/sharedcore.h b/src/sharedcore.h index 1887ca2..bf9395c 100644 --- a/src/sharedcore.h +++ b/src/sharedcore.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/signals.cpp b/src/signals.cpp index 7ba02c5..ffbc7ba 100644 --- a/src/signals.cpp +++ b/src/signals.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/signals.h b/src/signals.h index 5bdc53d..39f15ec 100644 --- a/src/signals.h +++ b/src/signals.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/singleton.h b/src/singleton.h index 5bc7abe..13db01b 100644 --- a/src/singleton.h +++ b/src/singleton.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/sio.cpp b/src/sio.cpp index 4567297..0fe60d9 100644 --- a/src/sio.cpp +++ b/src/sio.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/sptr.cpp b/src/sptr.cpp index 5761825..ea21e3b 100644 --- a/src/sptr.cpp +++ b/src/sptr.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/stack.cpp b/src/stack.cpp index 5d2a2c6..73352d3 100644 --- a/src/stack.cpp +++ b/src/stack.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/stack.h b/src/stack.h index 11ad057..a6ea1b9 100644 --- a/src/stack.h +++ b/src/stack.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/stdstream.cpp b/src/stdstream.cpp index 64ca1cd..b1d5d61 100644 --- a/src/stdstream.cpp +++ b/src/stdstream.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -100,3 +100,18 @@ void Bu::StdStream::setSize( Bu::size ) | |||
100 | { | 100 | { |
101 | } | 101 | } |
102 | 102 | ||
103 | Bu::size Bu::StdStream::getSize() const | ||
104 | { | ||
105 | return 0; | ||
106 | } | ||
107 | |||
108 | Bu::size Bu::StdStream::getBlockSize() const | ||
109 | { | ||
110 | return 0; | ||
111 | } | ||
112 | |||
113 | Bu::String Bu::StdStream::getLocation() const | ||
114 | { | ||
115 | return ""; | ||
116 | } | ||
117 | |||
diff --git a/src/stdstream.h b/src/stdstream.h index c500dfc..ff6c774 100644 --- a/src/stdstream.h +++ b/src/stdstream.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -41,6 +41,9 @@ namespace Bu | |||
41 | virtual bool isBlocking(); | 41 | virtual bool isBlocking(); |
42 | virtual void setBlocking( bool bBlocking=true ); | 42 | virtual void setBlocking( bool bBlocking=true ); |
43 | virtual void setSize( size iSize ); | 43 | virtual void setSize( size iSize ); |
44 | virtual size getSize() const; | ||
45 | virtual size getBlockSize() const; | ||
46 | virtual Bu::String getLocation() const; | ||
44 | }; | 47 | }; |
45 | } | 48 | } |
46 | 49 | ||
diff --git a/src/stream.cpp b/src/stream.cpp index 33817de..028166e 100644 --- a/src/stream.cpp +++ b/src/stream.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/stream.h b/src/stream.h index abbc9e8..fb70f21 100644 --- a/src/stream.h +++ b/src/stream.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/streamstack.cpp b/src/streamstack.cpp index f400364..d45306d 100644 --- a/src/streamstack.cpp +++ b/src/streamstack.cpp | |||
@@ -1,3 +1,10 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. | ||
3 | * | ||
4 | * This file is part of the libbu++ library and is released under the | ||
5 | * terms of the license contained in the file LICENSE. | ||
6 | */ | ||
7 | |||
1 | #include "bu/streamstack.h" | 8 | #include "bu/streamstack.h" |
2 | 9 | ||
3 | Bu::StreamStack::StreamStack() | 10 | Bu::StreamStack::StreamStack() |
@@ -72,49 +79,49 @@ void Bu::StreamStack::close() | |||
72 | lFilts.first()->close(); | 79 | lFilts.first()->close(); |
73 | } | 80 | } |
74 | 81 | ||
75 | size_t Bu::StreamStack::read( void *pBuf, size_t nBytes ) | 82 | Bu::size Bu::StreamStack::read( void *pBuf, Bu::size nBytes ) |
76 | { | 83 | { |
77 | checkStack(); | 84 | checkStack(); |
78 | 85 | ||
79 | return lFilts.first()->read( pBuf, nBytes ); | 86 | return lFilts.first()->read( pBuf, nBytes ); |
80 | } | 87 | } |
81 | 88 | ||
82 | size_t Bu::StreamStack::write( const void *pBuf, size_t nBytes ) | 89 | Bu::size Bu::StreamStack::write( const void *pBuf, Bu::size nBytes ) |
83 | { | 90 | { |
84 | checkStack(); | 91 | checkStack(); |
85 | 92 | ||
86 | return lFilts.first()->write( pBuf, nBytes ); | 93 | return lFilts.first()->write( pBuf, nBytes ); |
87 | } | 94 | } |
88 | 95 | ||
89 | size_t Bu::StreamStack::write( const Bu::String &sBuf ) | 96 | Bu::size Bu::StreamStack::write( const Bu::String &sBuf ) |
90 | { | 97 | { |
91 | checkStack(); | 98 | checkStack(); |
92 | 99 | ||
93 | return lFilts.first()->write( sBuf ); | 100 | return lFilts.first()->write( sBuf ); |
94 | } | 101 | } |
95 | 102 | ||
96 | long Bu::StreamStack::tell() | 103 | Bu::size Bu::StreamStack::tell() |
97 | { | 104 | { |
98 | checkStack(); | 105 | checkStack(); |
99 | 106 | ||
100 | return lFilts.first()->tell(); | 107 | return lFilts.first()->tell(); |
101 | } | 108 | } |
102 | 109 | ||
103 | void Bu::StreamStack::seek( long offset ) | 110 | void Bu::StreamStack::seek( Bu::size offset ) |
104 | { | 111 | { |
105 | checkStack(); | 112 | checkStack(); |
106 | 113 | ||
107 | lFilts.first()->seek( offset ); | 114 | lFilts.first()->seek( offset ); |
108 | } | 115 | } |
109 | 116 | ||
110 | void Bu::StreamStack::setPos( long pos ) | 117 | void Bu::StreamStack::setPos( Bu::size pos ) |
111 | { | 118 | { |
112 | checkStack(); | 119 | checkStack(); |
113 | 120 | ||
114 | lFilts.first()->setPos( pos ); | 121 | lFilts.first()->setPos( pos ); |
115 | } | 122 | } |
116 | 123 | ||
117 | void Bu::StreamStack::setPosEnd( long pos ) | 124 | void Bu::StreamStack::setPosEnd( Bu::size pos ) |
118 | { | 125 | { |
119 | checkStack(); | 126 | checkStack(); |
120 | 127 | ||
@@ -191,14 +198,35 @@ void Bu::StreamStack::setBlocking( bool bBlocking ) | |||
191 | lFilts.first()->setBlocking( bBlocking ); | 198 | lFilts.first()->setBlocking( bBlocking ); |
192 | } | 199 | } |
193 | 200 | ||
194 | void Bu::StreamStack::setSize( long iSize ) | 201 | void Bu::StreamStack::setSize( Bu::size iSize ) |
195 | { | 202 | { |
196 | checkStack(); | 203 | checkStack(); |
197 | 204 | ||
198 | lFilts.first()->setSize( iSize ); | 205 | lFilts.first()->setSize( iSize ); |
199 | } | 206 | } |
200 | 207 | ||
201 | inline void Bu::StreamStack::checkStack() | 208 | Bu::size Bu::StreamStack::getSize() const |
209 | { | ||
210 | checkStack(); | ||
211 | |||
212 | return lFilts.first()->getSize(); | ||
213 | } | ||
214 | |||
215 | Bu::size Bu::StreamStack::getBlockSize() const | ||
216 | { | ||
217 | checkStack(); | ||
218 | |||
219 | return lFilts.first()->getBlockSize(); | ||
220 | } | ||
221 | |||
222 | Bu::String Bu::StreamStack::getLocation() const | ||
223 | { | ||
224 | checkStack(); | ||
225 | |||
226 | return lFilts.first()->getLocation(); | ||
227 | } | ||
228 | |||
229 | inline void Bu::StreamStack::checkStack() const | ||
202 | { | 230 | { |
203 | if( lFilts.isEmpty() ) | 231 | if( lFilts.isEmpty() ) |
204 | throw Bu::ExceptionBase("StreamStack is empty."); | 232 | throw Bu::ExceptionBase("StreamStack is empty."); |
diff --git a/src/streamstack.h b/src/streamstack.h index 2554bd2..846935b 100644 --- a/src/streamstack.h +++ b/src/streamstack.h | |||
@@ -1,3 +1,10 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. | ||
3 | * | ||
4 | * This file is part of the libbu++ library and is released under the | ||
5 | * terms of the license contained in the file LICENSE. | ||
6 | */ | ||
7 | |||
1 | #ifndef BU_STREAM_STACK_H | 8 | #ifndef BU_STREAM_STACK_H |
2 | #define BU_STREAM_STACK_H | 9 | #define BU_STREAM_STACK_H |
3 | 10 | ||
@@ -103,14 +110,14 @@ namespace Bu | |||
103 | // | 110 | // |
104 | 111 | ||
105 | virtual void close(); | 112 | virtual void close(); |
106 | virtual size_t read( void *pBuf, size_t nBytes ); | 113 | virtual Bu::size read( void *pBuf, Bu::size nBytes ); |
107 | virtual size_t write( const void *pBuf, size_t nBytes ); | 114 | virtual Bu::size write( const void *pBuf, Bu::size nBytes ); |
108 | 115 | ||
109 | virtual size_t write( const Bu::String &sBuf ); | 116 | virtual Bu::size write( const Bu::String &sBuf ); |
110 | virtual long tell(); | 117 | virtual Bu::size tell(); |
111 | virtual void seek( long offset ); | 118 | virtual void seek( Bu::size offset ); |
112 | virtual void setPos( long pos ); | 119 | virtual void setPos( Bu::size pos ); |
113 | virtual void setPosEnd( long pos ); | 120 | virtual void setPosEnd( Bu::size pos ); |
114 | virtual bool isEos(); | 121 | virtual bool isEos(); |
115 | virtual bool isOpen(); | 122 | virtual bool isOpen(); |
116 | virtual void flush(); | 123 | virtual void flush(); |
@@ -121,10 +128,13 @@ namespace Bu | |||
121 | virtual bool isSeekable(); | 128 | virtual bool isSeekable(); |
122 | virtual bool isBlocking(); | 129 | virtual bool isBlocking(); |
123 | virtual void setBlocking( bool bBlocking=true ); | 130 | virtual void setBlocking( bool bBlocking=true ); |
124 | virtual void setSize( long iSize ); | 131 | virtual void setSize( Bu::size iSize ); |
132 | virtual size getSize() const; | ||
133 | virtual size getBlockSize() const; | ||
134 | virtual Bu::String getLocation() const; | ||
125 | 135 | ||
126 | private: | 136 | private: |
127 | void checkStack(); | 137 | void checkStack() const; |
128 | 138 | ||
129 | private: | 139 | private: |
130 | FilterList lFilts; | 140 | FilterList lFilts; |
diff --git a/src/string.cpp b/src/string.cpp index 3f895dc..538ac52 100644 --- a/src/string.cpp +++ b/src/string.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/string.h b/src/string.h index 5a0c471..22db827 100644 --- a/src/string.h +++ b/src/string.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/substream.cpp b/src/substream.cpp index 25d301a..c201752 100644 --- a/src/substream.cpp +++ b/src/substream.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -7,7 +7,7 @@ | |||
7 | 7 | ||
8 | #include "bu/substream.h" | 8 | #include "bu/substream.h" |
9 | 9 | ||
10 | Bu::SubStream::SubStream( Bu::Stream &rNext, long iSize ) : | 10 | Bu::SubStream::SubStream( Bu::Stream &rNext, Bu::size iSize ) : |
11 | Bu::Filter( rNext ), | 11 | Bu::Filter( rNext ), |
12 | iStart( 0 ), | 12 | iStart( 0 ), |
13 | iPos( 0 ), | 13 | iPos( 0 ), |
@@ -20,18 +20,18 @@ Bu::SubStream::~SubStream() | |||
20 | { | 20 | { |
21 | } | 21 | } |
22 | 22 | ||
23 | size_t Bu::SubStream::read( void *pBuf, size_t nBytes ) | 23 | Bu::size Bu::SubStream::read( void *pBuf, Bu::size nBytes ) |
24 | { | 24 | { |
25 | if( (long)nBytes > iSize-iPos ) | 25 | if( (Bu::size)nBytes > iSize-iPos ) |
26 | nBytes = iSize-iPos; | 26 | nBytes = iSize-iPos; |
27 | nBytes = rNext.read( pBuf, nBytes ); | 27 | nBytes = rNext.read( pBuf, nBytes ); |
28 | iPos += nBytes; | 28 | iPos += nBytes; |
29 | return nBytes; | 29 | return nBytes; |
30 | } | 30 | } |
31 | 31 | ||
32 | size_t Bu::SubStream::write( const void *pBuf, size_t nBytes ) | 32 | Bu::size Bu::SubStream::write( const void *pBuf, Bu::size nBytes ) |
33 | { | 33 | { |
34 | if( (long)nBytes > iSize-iPos ) | 34 | if( (Bu::size)nBytes > iSize-iPos ) |
35 | nBytes = iSize-iPos; | 35 | nBytes = iSize-iPos; |
36 | nBytes = rNext.write( pBuf, nBytes ); | 36 | nBytes = rNext.write( pBuf, nBytes ); |
37 | iPos += nBytes; | 37 | iPos += nBytes; |
@@ -43,7 +43,7 @@ void Bu::SubStream::start() | |||
43 | // doesn't mean anything... | 43 | // doesn't mean anything... |
44 | } | 44 | } |
45 | 45 | ||
46 | size_t Bu::SubStream::stop() | 46 | Bu::size Bu::SubStream::stop() |
47 | { | 47 | { |
48 | // doesn't mean anything... | 48 | // doesn't mean anything... |
49 | return 0; | 49 | return 0; |
@@ -54,12 +54,12 @@ void Bu::SubStream::close() | |||
54 | // don't do anything? maybe... | 54 | // don't do anything? maybe... |
55 | } | 55 | } |
56 | 56 | ||
57 | long Bu::SubStream::tell() | 57 | Bu::size Bu::SubStream::tell() |
58 | { | 58 | { |
59 | return iPos; | 59 | return iPos; |
60 | } | 60 | } |
61 | 61 | ||
62 | void Bu::SubStream::seek( long offset ) | 62 | void Bu::SubStream::seek( Bu::size offset ) |
63 | { | 63 | { |
64 | if( iPos+offset < 0 ) | 64 | if( iPos+offset < 0 ) |
65 | offset = -iPos; | 65 | offset = -iPos; |
@@ -69,7 +69,7 @@ void Bu::SubStream::seek( long offset ) | |||
69 | iPos += offset; | 69 | iPos += offset; |
70 | } | 70 | } |
71 | 71 | ||
72 | void Bu::SubStream::setPos( long pos ) | 72 | void Bu::SubStream::setPos( Bu::size pos ) |
73 | { | 73 | { |
74 | if( pos < 0 ) | 74 | if( pos < 0 ) |
75 | pos = 0; | 75 | pos = 0; |
@@ -80,7 +80,7 @@ void Bu::SubStream::setPos( long pos ) | |||
80 | rNext.setPos( pos ); | 80 | rNext.setPos( pos ); |
81 | } | 81 | } |
82 | 82 | ||
83 | void Bu::SubStream::setPosEnd( long pos ) | 83 | void Bu::SubStream::setPosEnd( Bu::size pos ) |
84 | { | 84 | { |
85 | if( iSize-pos < 0 ) | 85 | if( iSize-pos < 0 ) |
86 | pos = 0; | 86 | pos = 0; |
diff --git a/src/substream.h b/src/substream.h index b460f13..1db4d6c 100644 --- a/src/substream.h +++ b/src/substream.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -34,29 +34,29 @@ namespace Bu | |||
34 | class SubStream : public Bu::Filter | 34 | class SubStream : public Bu::Filter |
35 | { | 35 | { |
36 | public: | 36 | public: |
37 | SubStream( Bu::Stream &rNext, long iSize ); | 37 | SubStream( Bu::Stream &rNext, Bu::size iSize ); |
38 | virtual ~SubStream(); | 38 | virtual ~SubStream(); |
39 | 39 | ||
40 | virtual size_t read( void *pBuf, size_t nBytes ); | 40 | virtual Bu::size read( void *pBuf, Bu::size nBytes ); |
41 | virtual size_t write( const void *pBuf, size_t nBytes ); | 41 | virtual Bu::size write( const void *pBuf, Bu::size nBytes ); |
42 | using Bu::Stream::write; | 42 | using Bu::Stream::write; |
43 | 43 | ||
44 | virtual void start(); | 44 | virtual void start(); |
45 | virtual size_t stop(); | 45 | virtual Bu::size stop(); |
46 | virtual void close(); | 46 | virtual void close(); |
47 | virtual long tell(); | 47 | virtual Bu::size tell(); |
48 | virtual void seek( long offset ); | 48 | virtual void seek( Bu::size offset ); |
49 | virtual void setPos( long pos ); | 49 | virtual void setPos( Bu::size pos ); |
50 | virtual void setPosEnd( long pos ); | 50 | virtual void setPosEnd( Bu::size pos ); |
51 | virtual bool isEos(); | 51 | virtual bool isEos(); |
52 | 52 | ||
53 | virtual bool canRead(); | 53 | virtual bool canRead(); |
54 | virtual bool canWrite(); | 54 | virtual bool canWrite(); |
55 | 55 | ||
56 | protected: | 56 | protected: |
57 | long iStart; | 57 | Bu::size iStart; |
58 | long iPos; | 58 | Bu::size iPos; |
59 | long iSize; | 59 | Bu::size iSize; |
60 | }; | 60 | }; |
61 | }; | 61 | }; |
62 | 62 | ||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tafcomment.cpp b/src/tafcomment.cpp index 2f0dc17..c7096ca 100644 --- a/src/tafcomment.cpp +++ b/src/tafcomment.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tafcomment.h b/src/tafcomment.h index 942beb3..4efd548 100644 --- a/src/tafcomment.h +++ b/src/tafcomment.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tafgroup.cpp b/src/tafgroup.cpp index 42f4610..ee180c3 100644 --- a/src/tafgroup.cpp +++ b/src/tafgroup.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tafgroup.h b/src/tafgroup.h index 096a32f..119e827 100644 --- a/src/tafgroup.h +++ b/src/tafgroup.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tafnode.cpp b/src/tafnode.cpp index da85d20..0757a46 100644 --- a/src/tafnode.cpp +++ b/src/tafnode.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tafnode.h b/src/tafnode.h index 6c7123d..d7a9159 100644 --- a/src/tafnode.h +++ b/src/tafnode.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tafproperty.cpp b/src/tafproperty.cpp index 96f8501..4ef5c24 100644 --- a/src/tafproperty.cpp +++ b/src/tafproperty.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tafproperty.h b/src/tafproperty.h index 10a1c1a..7091de5 100644 --- a/src/tafproperty.h +++ b/src/tafproperty.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tafreader.cpp b/src/tafreader.cpp index f409170..6708c8c 100644 --- a/src/tafreader.cpp +++ b/src/tafreader.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tafreader.h b/src/tafreader.h index c91d1b1..10ebfc0 100644 --- a/src/tafreader.h +++ b/src/tafreader.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tafwriter.cpp b/src/tafwriter.cpp index 78d4060..b24bd1e 100644 --- a/src/tafwriter.cpp +++ b/src/tafwriter.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tafwriter.h b/src/tafwriter.h index 2bdd291..3fd71de 100644 --- a/src/tafwriter.h +++ b/src/tafwriter.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tcpserversocket.cpp b/src/tcpserversocket.cpp index 0de6593..a2fe6b4 100644 --- a/src/tcpserversocket.cpp +++ b/src/tcpserversocket.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tcpserversocket.h b/src/tcpserversocket.h index b6c6f87..efb7287 100644 --- a/src/tcpserversocket.h +++ b/src/tcpserversocket.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tcpsocket.cpp b/src/tcpsocket.cpp index 522a6b7..52dfc5c 100644 --- a/src/tcpsocket.cpp +++ b/src/tcpsocket.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -436,8 +436,6 @@ void Bu::TcpSocket::setAddress() | |||
436 | addr.sin_family = AF_INET; | 436 | addr.sin_family = AF_INET; |
437 | bu_getpeername( nTcpSocket, (sockaddr *)(&addr), &len ); | 437 | bu_getpeername( nTcpSocket, (sockaddr *)(&addr), &len ); |
438 | sAddress = bu_inet_ntoa( addr.sin_addr ); | 438 | sAddress = bu_inet_ntoa( addr.sin_addr ); |
439 | |||
440 | printf("%d\n", IP_MTU ); | ||
441 | } | 439 | } |
442 | 440 | ||
443 | Bu::String Bu::TcpSocket::getAddress() const | 441 | Bu::String Bu::TcpSocket::getAddress() const |
@@ -457,10 +455,11 @@ Bu::size Bu::TcpSocket::getSize() const | |||
457 | 455 | ||
458 | Bu::size Bu::TcpSocket::getBlockSize() const | 456 | Bu::size Bu::TcpSocket::getBlockSize() const |
459 | { | 457 | { |
460 | 458 | return 1500; //TODO: Fix this, it's stupid. | |
461 | } | 459 | } |
462 | 460 | ||
463 | Bu::String Bu::TcpSocket::getLocation() const | 461 | Bu::String Bu::TcpSocket::getLocation() const |
464 | { | 462 | { |
463 | return getAddress(); | ||
465 | } | 464 | } |
466 | 465 | ||
diff --git a/src/tcpsocket.h b/src/tcpsocket.h index 0941c65..a05580a 100644 --- a/src/tcpsocket.h +++ b/src/tcpsocket.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/archive.cpp b/src/tests/archive.cpp index de227b0..c905007 100644 --- a/src/tests/archive.cpp +++ b/src/tests/archive.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/archive2.cpp b/src/tests/archive2.cpp index 75db442..e8d3360 100644 --- a/src/tests/archive2.cpp +++ b/src/tests/archive2.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/atom.cpp b/src/tests/atom.cpp index 7784a9e..7808282 100644 --- a/src/tests/atom.cpp +++ b/src/tests/atom.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/base64.cpp b/src/tests/base64.cpp index 483199c..413ff92 100644 --- a/src/tests/base64.cpp +++ b/src/tests/base64.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/buffer.cpp b/src/tests/buffer.cpp index a12223a..f3f6f41 100644 --- a/src/tests/buffer.cpp +++ b/src/tests/buffer.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/bzip2.cpp b/src/tests/bzip2.cpp index f869939..603e937 100644 --- a/src/tests/bzip2.cpp +++ b/src/tests/bzip2.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/cache.cpp b/src/tests/cache.cpp index 38a5591..243012d 100644 --- a/src/tests/cache.cpp +++ b/src/tests/cache.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/console.cpp b/src/tests/console.cpp index 8d2f469..670ff5b 100644 --- a/src/tests/console.cpp +++ b/src/tests/console.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/cryptpass.cpp b/src/tests/cryptpass.cpp index f9abef6..d272344 100644 --- a/src/tests/cryptpass.cpp +++ b/src/tests/cryptpass.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/csv.cpp b/src/tests/csv.cpp index e5efcfb..850fda8 100644 --- a/src/tests/csv.cpp +++ b/src/tests/csv.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/daysinmonth.cpp b/src/tests/daysinmonth.cpp index e0aafc6..1e78eb3 100644 --- a/src/tests/daysinmonth.cpp +++ b/src/tests/daysinmonth.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/fastcgi.cpp b/src/tests/fastcgi.cpp index 5f7758e..7ca4ebc 100644 --- a/src/tests/fastcgi.cpp +++ b/src/tests/fastcgi.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/formula.cpp b/src/tests/formula.cpp index b9c4446..a90ddaf 100644 --- a/src/tests/formula.cpp +++ b/src/tests/formula.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/fstratsptr.cpp b/src/tests/fstratsptr.cpp index fa38459..5053dd1 100644 --- a/src/tests/fstratsptr.cpp +++ b/src/tests/fstratsptr.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/fstrformat.cpp b/src/tests/fstrformat.cpp index 2f04fe9..a911a8f 100644 --- a/src/tests/fstrformat.cpp +++ b/src/tests/fstrformat.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/fstring.cpp b/src/tests/fstring.cpp index acc3558..12ce8a8 100644 --- a/src/tests/fstring.cpp +++ b/src/tests/fstring.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/fstrstd.cpp b/src/tests/fstrstd.cpp index 4209c65..b2fed8a 100644 --- a/src/tests/fstrstd.cpp +++ b/src/tests/fstrstd.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/hash.cpp b/src/tests/hash.cpp index 5bd70f6..7cefb79 100644 --- a/src/tests/hash.cpp +++ b/src/tests/hash.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/hash2.cpp b/src/tests/hash2.cpp index 5f1dd09..55bb4c9 100644 --- a/src/tests/hash2.cpp +++ b/src/tests/hash2.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/heap.cpp b/src/tests/heap.cpp index 3576f25..14da55a 100644 --- a/src/tests/heap.cpp +++ b/src/tests/heap.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/itoheap.cpp b/src/tests/itoheap.cpp index 347f1e0..ec06b90 100644 --- a/src/tests/itoheap.cpp +++ b/src/tests/itoheap.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/itoqueue1.cpp b/src/tests/itoqueue1.cpp index 11dbb49..27cb93c 100644 --- a/src/tests/itoqueue1.cpp +++ b/src/tests/itoqueue1.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/itoqueue2.cpp b/src/tests/itoqueue2.cpp index 5283854..10bc566 100644 --- a/src/tests/itoqueue2.cpp +++ b/src/tests/itoqueue2.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/itoserver.cpp b/src/tests/itoserver.cpp index 5f6e4fa..48ef527 100644 --- a/src/tests/itoserver.cpp +++ b/src/tests/itoserver.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/list.cpp b/src/tests/list.cpp index c70fbc8..aa3d32d 100644 --- a/src/tests/list.cpp +++ b/src/tests/list.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/list2.cpp b/src/tests/list2.cpp index dc936d3..567370e 100644 --- a/src/tests/list2.cpp +++ b/src/tests/list2.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/listsort.cpp b/src/tests/listsort.cpp index 00e7268..4873a05 100644 --- a/src/tests/listsort.cpp +++ b/src/tests/listsort.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/logger.cpp b/src/tests/logger.cpp index e9043db..e97193c 100644 --- a/src/tests/logger.cpp +++ b/src/tests/logger.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/md5.cpp b/src/tests/md5.cpp index 368b033..a32f669 100644 --- a/src/tests/md5.cpp +++ b/src/tests/md5.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/minicron.cpp b/src/tests/minicron.cpp index 0749f90..aed63e2 100644 --- a/src/tests/minicron.cpp +++ b/src/tests/minicron.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/mmparse.cpp b/src/tests/mmparse.cpp index 1123d21..c1ce862 100644 --- a/src/tests/mmparse.cpp +++ b/src/tests/mmparse.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/multiserver.cpp b/src/tests/multiserver.cpp index 85971b5..12f4681 100644 --- a/src/tests/multiserver.cpp +++ b/src/tests/multiserver.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/optparser.cpp b/src/tests/optparser.cpp index ae658df..aadb07c 100644 --- a/src/tests/optparser.cpp +++ b/src/tests/optparser.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/procs.cpp b/src/tests/procs.cpp index bb5ff96..94d2cc5 100644 --- a/src/tests/procs.cpp +++ b/src/tests/procs.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/queuebuf.cpp b/src/tests/queuebuf.cpp index 0cb8b48..f872738 100644 --- a/src/tests/queuebuf.cpp +++ b/src/tests/queuebuf.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/regex.cpp b/src/tests/regex.cpp index 0a33a93..376fbb2 100644 --- a/src/tests/regex.cpp +++ b/src/tests/regex.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/ringbuffer.cpp b/src/tests/ringbuffer.cpp index 003d7be..da5126c 100644 --- a/src/tests/ringbuffer.cpp +++ b/src/tests/ringbuffer.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/rot13.cpp b/src/tests/rot13.cpp index 03ba385..1530af3 100644 --- a/src/tests/rot13.cpp +++ b/src/tests/rot13.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -28,21 +28,21 @@ public: | |||
28 | { | 28 | { |
29 | } | 29 | } |
30 | 30 | ||
31 | virtual size_t stop() | 31 | virtual Bu::size stop() |
32 | { | 32 | { |
33 | return 0; | 33 | return 0; |
34 | } | 34 | } |
35 | 35 | ||
36 | virtual size_t read( void *pBuf, size_t nBytes ) | 36 | virtual Bu::size read( void *pBuf, Bu::size nBytes ) |
37 | { | 37 | { |
38 | return rNext.read( pBuf, nBytes ); | 38 | return rNext.read( pBuf, nBytes ); |
39 | } | 39 | } |
40 | 40 | ||
41 | virtual size_t write( const void *pBuf, size_t nBytes ) | 41 | virtual Bu::size write( const void *pBuf, Bu::size nBytes ) |
42 | { | 42 | { |
43 | const char *cBuf = (const char *)pBuf; | 43 | const char *cBuf = (const char *)pBuf; |
44 | char *buf = new char[nBytes]; | 44 | char *buf = new char[nBytes]; |
45 | for( size_t j = 0; j < nBytes; j++ ) | 45 | for( Bu::size j = 0; j < nBytes; j++ ) |
46 | { | 46 | { |
47 | if( cBuf[j] >= 'a' && cBuf[j] <= 'z' ) | 47 | if( cBuf[j] >= 'a' && cBuf[j] <= 'z' ) |
48 | buf[j] = (cBuf[j]-'a'+13)%26+'a'; | 48 | buf[j] = (cBuf[j]-'a'+13)%26+'a'; |
diff --git a/src/tests/serverticks.cpp b/src/tests/serverticks.cpp index bffa363..3872a16 100644 --- a/src/tests/serverticks.cpp +++ b/src/tests/serverticks.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/sha1.cpp b/src/tests/sha1.cpp index 84cebe5..ac795e7 100644 --- a/src/tests/sha1.cpp +++ b/src/tests/sha1.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/sharedcore.cpp b/src/tests/sharedcore.cpp index 9b0a0ec..c68f07b 100644 --- a/src/tests/sharedcore.cpp +++ b/src/tests/sharedcore.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/signals.cpp b/src/tests/signals.cpp index a8c8c4e..14bbc9c 100644 --- a/src/tests/signals.cpp +++ b/src/tests/signals.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/size.cpp b/src/tests/size.cpp index 841325d..dfad16f 100644 --- a/src/tests/size.cpp +++ b/src/tests/size.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/socketblock.cpp b/src/tests/socketblock.cpp index 793ef96..e36bb33 100644 --- a/src/tests/socketblock.cpp +++ b/src/tests/socketblock.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/socketbreak.cpp b/src/tests/socketbreak.cpp index 7d3c71a..d58ebcf 100644 --- a/src/tests/socketbreak.cpp +++ b/src/tests/socketbreak.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -26,9 +26,9 @@ int main() | |||
26 | 26 | ||
27 | char buf[3]; | 27 | char buf[3]; |
28 | printf("About to write.\n"); | 28 | printf("About to write.\n"); |
29 | printf("write: %d\n", sSend.write("hi", 2 ) ); | 29 | printf("write: %lld\n", sSend.write("hi", 2 ) ); |
30 | printf("About to read.\n"); | 30 | printf("About to read.\n"); |
31 | printf("read: %d\n", sSend.read( buf, 2 ) ); | 31 | printf("read: %lld\n", sSend.read( buf, 2 ) ); |
32 | 32 | ||
33 | return 0; | 33 | return 0; |
34 | } | 34 | } |
diff --git a/src/tests/speed.cpp b/src/tests/speed.cpp index c78dded..2fa29aa 100644 --- a/src/tests/speed.cpp +++ b/src/tests/speed.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/stdstream.cpp b/src/tests/stdstream.cpp index e1f04f5..95df42e 100644 --- a/src/tests/stdstream.cpp +++ b/src/tests/stdstream.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/streamstack.cpp b/src/tests/streamstack.cpp index ea9ec0b..4a0e128 100644 --- a/src/tests/streamstack.cpp +++ b/src/tests/streamstack.cpp | |||
@@ -1,3 +1,10 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. | ||
3 | * | ||
4 | * This file is part of the libbu++ library and is released under the | ||
5 | * terms of the license contained in the file LICENSE. | ||
6 | */ | ||
7 | |||
1 | #include "bu/streamstack.h" | 8 | #include "bu/streamstack.h" |
2 | 9 | ||
3 | #include "bu/file.h" | 10 | #include "bu/file.h" |
diff --git a/src/tests/taf.cpp b/src/tests/taf.cpp index 484e784..1703fbc 100644 --- a/src/tests/taf.cpp +++ b/src/tests/taf.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/tcpsocket.cpp b/src/tests/tcpsocket.cpp index 30dd22f..89c015c 100644 --- a/src/tests/tcpsocket.cpp +++ b/src/tests/tcpsocket.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/telnetsrv.cpp b/src/tests/telnetsrv.cpp index f62714a..aac6b39 100644 --- a/src/tests/telnetsrv.cpp +++ b/src/tests/telnetsrv.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/tracer.cpp b/src/tests/tracer.cpp index c736d9e..703fa1a 100644 --- a/src/tests/tracer.cpp +++ b/src/tests/tracer.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/url.cpp b/src/tests/url.cpp index 6331664..a381cbe 100644 --- a/src/tests/url.cpp +++ b/src/tests/url.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/uuid.cpp b/src/tests/uuid.cpp index 1393e8c..b6470fa 100644 --- a/src/tests/uuid.cpp +++ b/src/tests/uuid.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tests/variant.cpp b/src/tests/variant.cpp index 79893c0..68dec4f 100644 --- a/src/tests/variant.cpp +++ b/src/tests/variant.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tools/bnfcompile.cpp b/src/tools/bnfcompile.cpp index b7b363c..011ec84 100644 --- a/src/tools/bnfcompile.cpp +++ b/src/tools/bnfcompile.cpp | |||
@@ -1,3 +1,10 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. | ||
3 | * | ||
4 | * This file is part of the libbu++ library and is released under the | ||
5 | * terms of the license contained in the file LICENSE. | ||
6 | */ | ||
7 | |||
1 | #include <bu/sio.h> | 8 | #include <bu/sio.h> |
2 | #include <bu/lexer.h> | 9 | #include <bu/lexer.h> |
3 | #include <bu/parser.h> | 10 | #include <bu/parser.h> |
diff --git a/src/tools/mkunit.cpp b/src/tools/mkunit.cpp index c0b7b8b..741a888 100644 --- a/src/tools/mkunit.cpp +++ b/src/tools/mkunit.cpp | |||
@@ -1,3 +1,10 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. | ||
3 | * | ||
4 | * This file is part of the libbu++ library and is released under the | ||
5 | * terms of the license contained in the file LICENSE. | ||
6 | */ | ||
7 | |||
1 | #include <bu/file.h> | 8 | #include <bu/file.h> |
2 | #include <bu/optparser.h> | 9 | #include <bu/optparser.h> |
3 | #include <bu/buffer.h> | 10 | #include <bu/buffer.h> |
diff --git a/src/tools/myriad.cpp b/src/tools/myriad.cpp index 7d7956e..7d4df75 100644 --- a/src/tools/myriad.cpp +++ b/src/tools/myriad.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/tools/myriadfs.cpp b/src/tools/myriadfs.cpp index 66955a5..88db0c0 100644 --- a/src/tools/myriadfs.cpp +++ b/src/tools/myriadfs.cpp | |||
@@ -1,3 +1,10 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. | ||
3 | * | ||
4 | * This file is part of the libbu++ library and is released under the | ||
5 | * terms of the license contained in the file LICENSE. | ||
6 | */ | ||
7 | |||
1 | #define FUSE_USE_VERSION 26 | 8 | #define FUSE_USE_VERSION 26 |
2 | 9 | ||
3 | #include <fuse.h> | 10 | #include <fuse.h> |
diff --git a/src/tools/parser.cpp b/src/tools/parser.cpp index 8350343..aa9e3e4 100644 --- a/src/tools/parser.cpp +++ b/src/tools/parser.cpp | |||
@@ -1,3 +1,10 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. | ||
3 | * | ||
4 | * This file is part of the libbu++ library and is released under the | ||
5 | * terms of the license contained in the file LICENSE. | ||
6 | */ | ||
7 | |||
1 | #include <bu/parser.h> | 8 | #include <bu/parser.h> |
2 | #include <bu/lexer.h> | 9 | #include <bu/lexer.h> |
3 | #include <bu/file.h> | 10 | #include <bu/file.h> |
diff --git a/src/tools/viewcsv.cpp b/src/tools/viewcsv.cpp index 9be1291..6997b9b 100644 --- a/src/tools/viewcsv.cpp +++ b/src/tools/viewcsv.cpp | |||
@@ -1,3 +1,10 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. | ||
3 | * | ||
4 | * This file is part of the libbu++ library and is released under the | ||
5 | * terms of the license contained in the file LICENSE. | ||
6 | */ | ||
7 | |||
1 | #include <bu/sio.h> | 8 | #include <bu/sio.h> |
2 | #include <bu/optparser.h> | 9 | #include <bu/optparser.h> |
3 | #include <bu/csvreader.h> | 10 | #include <bu/csvreader.h> |
diff --git a/src/trace.cpp b/src/trace.cpp index bd06683..906ce54 100644 --- a/src/trace.cpp +++ b/src/trace.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/trace.h b/src/trace.h index 9d5ac80..0ebd831 100644 --- a/src/trace.h +++ b/src/trace.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/unit/archive.unit b/src/unit/archive.unit index 07e5e11..89fde0c 100644 --- a/src/unit/archive.unit +++ b/src/unit/archive.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. |
diff --git a/src/unit/array.unit b/src/unit/array.unit index 4dc75d8..f6e6718 100644 --- a/src/unit/array.unit +++ b/src/unit/array.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. |
diff --git a/src/unit/buffer.unit b/src/unit/buffer.unit index 2a8f846..8106e4e 100644 --- a/src/unit/buffer.unit +++ b/src/unit/buffer.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. |
diff --git a/src/unit/entities/unit b/src/unit/entities/unit index 6876c54..4c5a835 100644 --- a/src/unit/entities/unit +++ b/src/unit/entities/unit | |||
@@ -5,7 +5,7 @@ | |||
5 | name="source" | 5 | name="source" |
6 | filename="{=name:%tolower}.cpp" | 6 | filename="{=name:%tolower}.cpp" |
7 | >/* | 7 | >/* |
8 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 8 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
9 | * | 9 | * |
10 | * This file is part of the libbu++ library and is released under the | 10 | * This file is part of the libbu++ library and is released under the |
11 | * terms of the license contained in the file LICENSE. | 11 | * terms of the license contained in the file LICENSE. |
diff --git a/src/unit/file.unit b/src/unit/file.unit index f8cf7c1..fb04e57 100644 --- a/src/unit/file.unit +++ b/src/unit/file.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. |
diff --git a/src/unit/fstring.unit b/src/unit/fstring.unit index d282052..f51e4de 100644 --- a/src/unit/fstring.unit +++ b/src/unit/fstring.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. |
diff --git a/src/unit/hash.unit b/src/unit/hash.unit index 2c1cf6a..64e70b6 100644 --- a/src/unit/hash.unit +++ b/src/unit/hash.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. |
diff --git a/src/unit/list.unit b/src/unit/list.unit index 24346a3..2b315dc 100644 --- a/src/unit/list.unit +++ b/src/unit/list.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. |
diff --git a/src/unit/membuf.unit b/src/unit/membuf.unit index 1da3b90..aefc2c1 100644 --- a/src/unit/membuf.unit +++ b/src/unit/membuf.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. |
diff --git a/src/unit/myriad.unit b/src/unit/myriad.unit index 5ac80a0..e0f7ef4 100644 --- a/src/unit/myriad.unit +++ b/src/unit/myriad.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. |
diff --git a/src/unit/queuebuf.unit b/src/unit/queuebuf.unit index 8de29e4..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. |
diff --git a/src/unit/substream.unit b/src/unit/substream.unit index 49817b0..456e69a 100644 --- a/src/unit/substream.unit +++ b/src/unit/substream.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. |
diff --git a/src/unit/taf.unit b/src/unit/taf.unit index 908e591..5fedcec 100644 --- a/src/unit/taf.unit +++ b/src/unit/taf.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. |
diff --git a/src/unit/variant.unit b/src/unit/variant.unit index ecfa5c3..ca977ee 100644 --- a/src/unit/variant.unit +++ b/src/unit/variant.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. |
diff --git a/src/unit/xml.unit b/src/unit/xml.unit index b4340e8..ab339c2 100644 --- a/src/unit/xml.unit +++ b/src/unit/xml.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. |
diff --git a/src/unitsuite.cpp b/src/unitsuite.cpp index 58646a0..db930a4 100644 --- a/src/unitsuite.cpp +++ b/src/unitsuite.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/unitsuite.h b/src/unitsuite.h index 6ac4f3e..2250a4d 100644 --- a/src/unitsuite.h +++ b/src/unitsuite.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/url.cpp b/src/url.cpp index 943b855..7b4a48e 100644 --- a/src/url.cpp +++ b/src/url.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/urn.cpp b/src/urn.cpp index b798a1f..106fb64 100644 --- a/src/urn.cpp +++ b/src/urn.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/utfstring.cpp b/src/utfstring.cpp index 7ba04ec..bb23db3 100644 --- a/src/utfstring.cpp +++ b/src/utfstring.cpp | |||
@@ -1,2 +1,9 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. | ||
3 | * | ||
4 | * This file is part of the libbu++ library and is released under the | ||
5 | * terms of the license contained in the file LICENSE. | ||
6 | */ | ||
7 | |||
1 | #include "bu/utfstring.h" | 8 | #include "bu/utfstring.h" |
2 | 9 | ||
diff --git a/src/utfstring.h b/src/utfstring.h index cfbd5f0..30b4c3a 100644 --- a/src/utfstring.h +++ b/src/utfstring.h | |||
@@ -1,3 +1,10 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. | ||
3 | * | ||
4 | * This file is part of the libbu++ library and is released under the | ||
5 | * terms of the license contained in the file LICENSE. | ||
6 | */ | ||
7 | |||
1 | #ifndef BU_UTF_STRING_H | 8 | #ifndef BU_UTF_STRING_H |
2 | #define BU_UTF_STRING_H | 9 | #define BU_UTF_STRING_H |
3 | 10 | ||
diff --git a/src/util.cpp b/src/util.cpp index 0d2420a..6983dfd 100644 --- a/src/util.cpp +++ b/src/util.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/uuid.cpp b/src/uuid.cpp index f46d2ae..69af5b4 100644 --- a/src/uuid.cpp +++ b/src/uuid.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/variant.cpp b/src/variant.cpp index a23a422..fd0511f 100644 --- a/src/variant.cpp +++ b/src/variant.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/variant.h b/src/variant.h index 80f1bb9..2b88efe 100644 --- a/src/variant.h +++ b/src/variant.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/xmlreader.cpp b/src/xmlreader.cpp index 7da2755..ba7fb3d 100644 --- a/src/xmlreader.cpp +++ b/src/xmlreader.cpp | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |
diff --git a/src/xmlreader.h b/src/xmlreader.h index a217ac5..7cb44c9 100644 --- a/src/xmlreader.h +++ b/src/xmlreader.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 2007-2010 Xagasoft, All rights reserved. | 2 | * Copyright (C) 2007-2011 Xagasoft, All rights reserved. |
3 | * | 3 | * |
4 | * This file is part of the libbu++ library and is released under the | 4 | * This file is part of the libbu++ library and is released under the |
5 | * terms of the license contained in the file LICENSE. | 5 | * terms of the license contained in the file LICENSE. |