From fbb30d35cfa10bf36d4ecb2d0eb5971c24aab26a Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Fri, 31 Jul 2009 20:51:28 +0000 Subject: I switched the Bu::Stream::isEOS function to be named Bu::Stream::isEos, and also made sure the copyright is at the top of all the files, it's been too long. Anyway, this may effect some code, but not much, and it's an easy enough fix. --- src/base64.cpp | 9 ++++++++- src/base64.h | 7 +++++++ src/bitstring.cpp | 7 +++++++ src/bitstring.h | 7 +++++++ src/cache.cpp | 7 +++++++ src/cache.h | 7 +++++++ src/cachecalc.cpp | 7 +++++++ src/cachecalc.h | 7 +++++++ src/cachestore.cpp | 7 +++++++ src/cachestore.h | 7 +++++++ src/cachestorenids.cpp | 7 +++++++ src/cachestorenids.h | 7 +++++++ src/cgiutil.cpp | 7 +++++++ src/cgiutil.h | 7 +++++++ src/cryptohash.cpp | 7 +++++++ src/cryptohash.h | 7 +++++++ src/fastcgi.cpp | 7 +++++++ src/fastcgi.h | 7 +++++++ src/fifo.cpp | 2 +- src/fifo.h | 2 +- src/file.cpp | 2 +- src/file.h | 2 +- src/filter.cpp | 4 ++-- src/filter.h | 2 +- src/formatter.cpp | 7 +++++++ src/formatter.h | 7 +++++++ src/httpget.cpp | 9 ++++++++- src/httpget.h | 9 ++++++++- src/itocounter.cpp | 7 +++++++ src/linux_compatibility.h | 7 +++++++ src/listhash.h | 7 +++++++ src/md5.cpp | 7 +++++++ src/md5.h | 7 +++++++ src/membuf.cpp | 6 +++--- src/membuf.h | 2 +- src/multiserver.cpp | 7 +++++++ src/multiserver.h | 7 +++++++ src/nidsstream.cpp | 9 ++++++++- src/nidsstream.h | 9 ++++++++- src/process.cpp | 2 +- src/process.h | 2 +- src/sha1.cpp | 7 +++++++ src/sha1.h | 7 +++++++ src/sio.cpp | 7 +++++++ src/sio.h | 7 +++++++ src/socket.cpp | 2 +- src/socket.h | 2 +- src/stdstream.cpp | 2 +- src/stdstream.h | 2 +- src/stream.h | 4 ++-- src/tafreader.cpp | 2 +- src/tests/archive2.cpp | 7 +++++++ src/tests/base64.cpp | 7 +++++++ src/tests/buffer.cpp | 7 +++++++ src/tests/bzip2.cpp | 2 +- src/tests/cache.cpp | 7 +++++++ src/tests/fastcgi.cpp | 7 +++++++ src/tests/heap.cpp | 7 +++++++ src/tests/itoheap.cpp | 7 +++++++ src/tests/md5.cpp | 7 +++++++ src/tests/multiserver.cpp | 7 +++++++ src/tests/nids.cpp | 7 +++++++ src/tests/procs.cpp | 7 +++++++ src/tests/rot13.cpp | 7 +++++++ src/tests/serverticks.cpp | 7 +++++++ src/tests/socketbreak.cpp | 7 +++++++ src/tests/stdstream.cpp | 7 +++++++ src/tests/tracer.cpp | 7 +++++++ src/tests/url.cpp | 7 +++++++ src/tools/nidstool.cpp | 7 +++++++ src/trace.cpp | 7 +++++++ src/unit/file.unit | 4 ++-- src/url.cpp | 7 +++++++ src/url.h | 7 +++++++ src/uuid.cpp | 7 +++++++ src/uuid.h | 7 +++++++ src/win32_compatibility.cpp | 7 +++++++ src/xmlreader.cpp | 13 ++++++++++--- src/xmlreader.h | 7 +++++++ 79 files changed, 458 insertions(+), 31 deletions(-) diff --git a/src/base64.cpp b/src/base64.cpp index be5fe8d..ccf9077 100644 --- a/src/base64.cpp +++ b/src/base64.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "bu/base64.h" namespace Bu { subExceptionDef( Base64Exception ) } @@ -109,7 +116,7 @@ size_t Bu::Base64::read( void *pBuf, size_t nBytes ) { if( rNext.read( &buf[j], 1 ) == 0 ) { - if( rNext.isEOS() ) + if( rNext.isEos() ) { iChars = 0; bEosIn = true; diff --git a/src/base64.h b/src/base64.h index a00ed0e..e0d8eeb 100644 --- a/src/base64.h +++ b/src/base64.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #ifndef BU_BASE64_H #define BU_BASE64_H diff --git a/src/bitstring.cpp b/src/bitstring.cpp index b3bcde5..f05818f 100644 --- a/src/bitstring.cpp +++ b/src/bitstring.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "bu/bitstring.h" #include #include diff --git a/src/bitstring.h b/src/bitstring.h index 9f0c719..35f854f 100644 --- a/src/bitstring.h +++ b/src/bitstring.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #ifndef BU_BITSTRING_H #define BU_BITSTRING_H diff --git a/src/cache.cpp b/src/cache.cpp index fd1082b..44245ac 100644 --- a/src/cache.cpp +++ b/src/cache.cpp @@ -1 +1,8 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "bu/cache.h" diff --git a/src/cache.h b/src/cache.h index 0cb2fd2..98775d2 100644 --- a/src/cache.h +++ b/src/cache.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #ifndef BU_CACHE_H #define BU_CACHE_H diff --git a/src/cachecalc.cpp b/src/cachecalc.cpp index 0080735..9e4d0da 100644 --- a/src/cachecalc.cpp +++ b/src/cachecalc.cpp @@ -1 +1,8 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "bu/cachecalc.h" diff --git a/src/cachecalc.h b/src/cachecalc.h index 7fdb16e..dd6add1 100644 --- a/src/cachecalc.h +++ b/src/cachecalc.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #ifndef BU_CACHE_CALC_H #define BU_CACHE_CALC_H diff --git a/src/cachestore.cpp b/src/cachestore.cpp index 7f26f17..94a945c 100644 --- a/src/cachestore.cpp +++ b/src/cachestore.cpp @@ -1,2 +1,9 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "bu/cachestore.h" diff --git a/src/cachestore.h b/src/cachestore.h index b75864b..6ce42b8 100644 --- a/src/cachestore.h +++ b/src/cachestore.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #ifndef BU_CACHE_STORE_H #define BU_CACHE_STORE_H diff --git a/src/cachestorenids.cpp b/src/cachestorenids.cpp index 2e50475..b2fadc1 100644 --- a/src/cachestorenids.cpp +++ b/src/cachestorenids.cpp @@ -1,2 +1,9 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "bu/cachestorenids.h" diff --git a/src/cachestorenids.h b/src/cachestorenids.h index 6a1c31b..3859900 100644 --- a/src/cachestorenids.h +++ b/src/cachestorenids.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #ifndef BU_CACHE_STORE_NIDS_H #define BU_CACHE_STORE_NIDS_H diff --git a/src/cgiutil.cpp b/src/cgiutil.cpp index 9cfd3f2..56d58f1 100644 --- a/src/cgiutil.cpp +++ b/src/cgiutil.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "bu/cgiutil.h" Bu::CgiUtil::CgiUtil() diff --git a/src/cgiutil.h b/src/cgiutil.h index c101b62..d44405a 100644 --- a/src/cgiutil.h +++ b/src/cgiutil.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #ifndef CGI_UTIL_H #define CGI_UTIL_H diff --git a/src/cryptohash.cpp b/src/cryptohash.cpp index 0fa2a25..cab2f3b 100644 --- a/src/cryptohash.cpp +++ b/src/cryptohash.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "bu/cryptohash.h" Bu::CryptoHash::CryptoHash() diff --git a/src/cryptohash.h b/src/cryptohash.h index ed8d9ec..87aaf09 100644 --- a/src/cryptohash.h +++ b/src/cryptohash.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #ifndef BU_CRYPTO_HASH_H #define BU_CRYPTO_HASH_H diff --git a/src/fastcgi.cpp b/src/fastcgi.cpp index 7d0cf3d..9aecbfb 100644 --- a/src/fastcgi.cpp +++ b/src/fastcgi.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "bu/fastcgi.h" #include diff --git a/src/fastcgi.h b/src/fastcgi.h index 4efa992..d57349a 100644 --- a/src/fastcgi.h +++ b/src/fastcgi.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #ifndef BU_FAST_CGI_H #define BU_FAST_CGI_H diff --git a/src/fifo.cpp b/src/fifo.cpp index 3f27b2c..f34bb91 100644 --- a/src/fifo.cpp +++ b/src/fifo.cpp @@ -93,7 +93,7 @@ void Bu::Fifo::setPosEnd( long ) { } -bool Bu::Fifo::isEOS() +bool Bu::Fifo::isEos() { return false; } diff --git a/src/fifo.h b/src/fifo.h index 2da5f16..da0b8b7 100644 --- a/src/fifo.h +++ b/src/fifo.h @@ -39,7 +39,7 @@ namespace Bu virtual void seek( long offset ); virtual void setPos( long pos ); virtual void setPosEnd( long pos ); - virtual bool isEOS(); + virtual bool isEos(); virtual bool isOpen(); virtual void flush(); diff --git a/src/file.cpp b/src/file.cpp index 0b9bff2..6228ba9 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -111,7 +111,7 @@ void Bu::File::setPosEnd( long pos ) lseek( fd, pos, SEEK_END ); } -bool Bu::File::isEOS() +bool Bu::File::isEos() { return bEos; } diff --git a/src/file.h b/src/file.h index 6f28e7b..ce6d174 100644 --- a/src/file.h +++ b/src/file.h @@ -39,7 +39,7 @@ namespace Bu virtual void seek( long offset ); virtual void setPos( long pos ); virtual void setPosEnd( long pos ); - virtual bool isEOS(); + virtual bool isEos(); virtual bool isOpen(); virtual void flush(); diff --git a/src/filter.cpp b/src/filter.cpp index 771cf0d..6938c02 100644 --- a/src/filter.cpp +++ b/src/filter.cpp @@ -42,9 +42,9 @@ void Bu::Filter::setPosEnd( long pos ) rNext.setPosEnd( pos ); } -bool Bu::Filter::isEOS() +bool Bu::Filter::isEos() { - return rNext.isEOS(); + return rNext.isEos(); } bool Bu::Filter::isOpen() diff --git a/src/filter.h b/src/filter.h index d28986d..2d3ae3a 100644 --- a/src/filter.h +++ b/src/filter.h @@ -47,7 +47,7 @@ namespace Bu virtual void seek( long offset ); virtual void setPos( long pos ); virtual void setPosEnd( long pos ); - virtual bool isEOS(); + virtual bool isEos(); virtual bool isOpen(); virtual void flush(); diff --git a/src/formatter.cpp b/src/formatter.cpp index dc4336b..b841c5e 100644 --- a/src/formatter.cpp +++ b/src/formatter.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "formatter.h" Bu::Formatter::Formatter( Stream &rOut ) : diff --git a/src/formatter.h b/src/formatter.h index 9f931ee..aacf893 100644 --- a/src/formatter.h +++ b/src/formatter.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #ifndef BU_FORMATTER_H #define BU_FORMATTER_H diff --git a/src/httpget.cpp b/src/httpget.cpp index c5aa16d..0356874 100644 --- a/src/httpget.cpp +++ b/src/httpget.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "bu/httpget.h" Bu::HttpGet::HttpGet( const Bu::Url &uSrc, const Bu::FString &sMethod ) : @@ -53,7 +60,7 @@ void Bu::HttpGet::setPosEnd( long ) { } -bool Bu::HttpGet::isEOS() +bool Bu::HttpGet::isEos() { return false; } diff --git a/src/httpget.h b/src/httpget.h index 25f5ab1..7484566 100644 --- a/src/httpget.h +++ b/src/httpget.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #ifndef BU_HTTP_GET_H #define BU_HTTP_GET_H @@ -26,7 +33,7 @@ namespace Bu virtual void seek( long offset ); virtual void setPos( long pos ); virtual void setPosEnd( long pos ); - virtual bool isEOS(); + virtual bool isEos(); virtual bool isOpen(); virtual void flush(); diff --git a/src/itocounter.cpp b/src/itocounter.cpp index 35298a9..03785a2 100644 --- a/src/itocounter.cpp +++ b/src/itocounter.cpp @@ -1 +1,8 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "bu/itocounter.h" diff --git a/src/linux_compatibility.h b/src/linux_compatibility.h index 5d2df1b..e0b14b9 100644 --- a/src/linux_compatibility.h +++ b/src/linux_compatibility.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #ifdef __linux__ #define bu_inet_ntoa inet_ntoa diff --git a/src/listhash.h b/src/listhash.h index 73aa3f8..c8c2689 100644 --- a/src/listhash.h +++ b/src/listhash.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #ifndef BU_LIST_HASH_H #define BU_LIST_HASH_H diff --git a/src/md5.cpp b/src/md5.cpp index 44e8519..14b244a 100644 --- a/src/md5.cpp +++ b/src/md5.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include #include #include diff --git a/src/md5.h b/src/md5.h index f3f040c..96ba2ce 100644 --- a/src/md5.h +++ b/src/md5.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #ifndef BU_MD5_H #define BU_MD5_H diff --git a/src/membuf.cpp b/src/membuf.cpp index f22a8de..11cc1bb 100644 --- a/src/membuf.cpp +++ b/src/membuf.cpp @@ -92,7 +92,7 @@ void Bu::MemBuf::setPosEnd( long pos ) else if( nPos > sBuf.getSize() ) nPos = sBuf.getSize(); } -bool Bu::MemBuf::isEOS() +bool Bu::MemBuf::isEos() { return (nPos == sBuf.getSize()); } @@ -108,12 +108,12 @@ void Bu::MemBuf::flush() bool Bu::MemBuf::canRead() { - return !isEOS(); + return !isEos(); } bool Bu::MemBuf::canWrite() { - return isEOS(); + return isEos(); } bool Bu::MemBuf::isReadable() diff --git a/src/membuf.h b/src/membuf.h index 15686e9..58b60b3 100644 --- a/src/membuf.h +++ b/src/membuf.h @@ -35,7 +35,7 @@ namespace Bu virtual void seek( long offset ); virtual void setPos( long pos ); virtual void setPosEnd( long pos ); - virtual bool isEOS(); + virtual bool isEos(); virtual bool isOpen(); virtual void flush(); virtual bool canRead(); diff --git a/src/multiserver.cpp b/src/multiserver.cpp index 56284b0..73c794c 100644 --- a/src/multiserver.cpp +++ b/src/multiserver.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "bu/multiserver.h" #include "bu/protocol.h" #include "bu/client.h" diff --git a/src/multiserver.h b/src/multiserver.h index cf71203..34b927c 100644 --- a/src/multiserver.h +++ b/src/multiserver.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #ifndef BU_MULTI_SERVER_H #define BU_MULTI_SERVER_H diff --git a/src/nidsstream.cpp b/src/nidsstream.cpp index 31e1293..9aee156 100644 --- a/src/nidsstream.cpp +++ b/src/nidsstream.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "bu/nidsstream.h" Bu::NidsStream::NidsStream( Nids &rNids, uint32_t uStream ) : @@ -178,7 +185,7 @@ void Bu::NidsStream::setPosEnd( long pos ) uPos = uSize-pos-1; } -bool Bu::NidsStream::isEOS() +bool Bu::NidsStream::isEos() { return true; } diff --git a/src/nidsstream.h b/src/nidsstream.h index c220e5c..9769c68 100644 --- a/src/nidsstream.h +++ b/src/nidsstream.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #ifndef BU_NIDS_STREAM_H #define BU_NIDS_STREAM_H @@ -27,7 +34,7 @@ namespace Bu virtual void seek( long offset ); virtual void setPos( long pos ); virtual void setPosEnd( long pos ); - virtual bool isEOS(); + virtual bool isEos(); virtual bool isOpen(); virtual void flush(); virtual bool canRead(); diff --git a/src/process.cpp b/src/process.cpp index ff40f73..bea5932 100644 --- a/src/process.cpp +++ b/src/process.cpp @@ -160,7 +160,7 @@ void Bu::Process::setPosEnd( long ) { } -bool Bu::Process::isEOS() +bool Bu::Process::isEos() { return false; } diff --git a/src/process.h b/src/process.h index a63fbf5..121b2dc 100644 --- a/src/process.h +++ b/src/process.h @@ -38,7 +38,7 @@ namespace Bu virtual void seek( long offset ); virtual void setPos( long pos ); virtual void setPosEnd( long pos ); - virtual bool isEOS(); + virtual bool isEos(); virtual bool isOpen(); virtual void flush(); diff --git a/src/sha1.cpp b/src/sha1.cpp index 8270c3b..8a75b97 100644 --- a/src/sha1.cpp +++ b/src/sha1.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include #include #include diff --git a/src/sha1.h b/src/sha1.h index ab6081d..f3dcfe6 100644 --- a/src/sha1.h +++ b/src/sha1.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + /* sha1.h Copyright (c) 2005 Michael D. Leonhard diff --git a/src/sio.cpp b/src/sio.cpp index 2e72fd9..8153df1 100644 --- a/src/sio.cpp +++ b/src/sio.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "bu/sio.h" Bu::StdStream Bu::sioRaw; diff --git a/src/sio.h b/src/sio.h index 298e786..205f672 100644 --- a/src/sio.h +++ b/src/sio.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #ifndef BU_SIO_H #define BU_SIO_H diff --git a/src/socket.cpp b/src/socket.cpp index 3ddc492..d1d5687 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -314,7 +314,7 @@ void Bu::Socket::setPosEnd( long ) throw UnsupportedException(); } -bool Bu::Socket::isEOS() +bool Bu::Socket::isEos() { return !bActive; } diff --git a/src/socket.h b/src/socket.h index bef0e9c..eac68fb 100644 --- a/src/socket.h +++ b/src/socket.h @@ -77,7 +77,7 @@ namespace Bu virtual void seek( long offset ); virtual void setPos( long pos ); virtual void setPosEnd( long pos ); - virtual bool isEOS(); + virtual bool isEos(); virtual bool isOpen(); virtual void flush(); diff --git a/src/stdstream.cpp b/src/stdstream.cpp index 844f495..05b8ee7 100644 --- a/src/stdstream.cpp +++ b/src/stdstream.cpp @@ -46,7 +46,7 @@ void Bu::StdStream::setPosEnd( long ) { } -bool Bu::StdStream::isEOS() +bool Bu::StdStream::isEos() { return false; } diff --git a/src/stdstream.h b/src/stdstream.h index b553a64..1bde088 100644 --- a/src/stdstream.h +++ b/src/stdstream.h @@ -31,7 +31,7 @@ namespace Bu virtual void seek( long offset ); virtual void setPos( long pos ); virtual void setPosEnd( long pos ); - virtual bool isEOS(); + virtual bool isEos(); virtual bool isOpen(); virtual void flush(); virtual bool canRead(); diff --git a/src/stream.h b/src/stream.h index 945d308..d6b914c 100644 --- a/src/stream.h +++ b/src/stream.h @@ -83,7 +83,7 @@ namespace Bu * Are we at the end of the stream? *@returns (bool) Are we at the end of the stream? */ - virtual bool isEOS() = 0; + virtual bool isEos() = 0; /** * Is the stream open? @@ -99,7 +99,7 @@ namespace Bu /** * In non-blocking streams this indicates if a read operation will * return data at the moment or not. In blocking streams this should - * return the same value as isEOS(). + * return the same value as isEos(). */ virtual bool canRead() = 0; diff --git a/src/tafreader.cpp b/src/tafreader.cpp index ceed9be..ebf54c1 100644 --- a/src/tafreader.cpp +++ b/src/tafreader.cpp @@ -226,7 +226,7 @@ void Bu::TafReader::rawread( char *c ) { if( sIn.read( c, 1 ) < 1 ) { - if( sIn.isEOS() ) + if( sIn.isEos() ) { throw TafException("%d:%d: Premature end of stream.", iLine, iCol, c ); diff --git a/src/tests/archive2.cpp b/src/tests/archive2.cpp index ab02d04..fddb91b 100644 --- a/src/tests/archive2.cpp +++ b/src/tests/archive2.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "bu/archive.h" #include "bu/archival.h" #include "bu/file.h" diff --git a/src/tests/base64.cpp b/src/tests/base64.cpp index 5e36448..b318f6a 100644 --- a/src/tests/base64.cpp +++ b/src/tests/base64.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "bu/file.h" #include "bu/membuf.h" #include "bu/base64.h" diff --git a/src/tests/buffer.cpp b/src/tests/buffer.cpp index a1a1105..e0bffc7 100644 --- a/src/tests/buffer.cpp +++ b/src/tests/buffer.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "bu/membuf.h" #include "bu/buffer.h" #include "bu/file.h" diff --git a/src/tests/bzip2.cpp b/src/tests/bzip2.cpp index 77dc064..d8c9cc7 100644 --- a/src/tests/bzip2.cpp +++ b/src/tests/bzip2.cpp @@ -29,7 +29,7 @@ int main( int argc, char *argv[] ) nRead = fin.read( buf, 1024 ); if( nRead > 0 ) bz2.write( buf, nRead ); - if( fin.isEOS() ) + if( fin.isEos() ) break; } } diff --git a/src/tests/cache.cpp b/src/tests/cache.cpp index 5d542ed..3fcc34c 100644 --- a/src/tests/cache.cpp +++ b/src/tests/cache.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include #include #include diff --git a/src/tests/fastcgi.cpp b/src/tests/fastcgi.cpp index e71b3c5..cd6cdda 100644 --- a/src/tests/fastcgi.cpp +++ b/src/tests/fastcgi.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "bu/fastcgi.h" class Cgi : public Bu::FastCgi diff --git a/src/tests/heap.cpp b/src/tests/heap.cpp index e35ea2a..daa0356 100644 --- a/src/tests/heap.cpp +++ b/src/tests/heap.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include #include diff --git a/src/tests/itoheap.cpp b/src/tests/itoheap.cpp index 67169e7..9016d86 100644 --- a/src/tests/itoheap.cpp +++ b/src/tests/itoheap.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include #include diff --git a/src/tests/md5.cpp b/src/tests/md5.cpp index 2e9c318..3b3d5e7 100644 --- a/src/tests/md5.cpp +++ b/src/tests/md5.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "bu/sio.h" #include "bu/file.h" #include "bu/md5.h" diff --git a/src/tests/multiserver.cpp b/src/tests/multiserver.cpp index f22147d..c4a00ab 100644 --- a/src/tests/multiserver.cpp +++ b/src/tests/multiserver.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "bu/multiserver.h" #include "bu/protocol.h" #include "bu/client.h" diff --git a/src/tests/nids.cpp b/src/tests/nids.cpp index d531280..bb5993b 100644 --- a/src/tests/nids.cpp +++ b/src/tests/nids.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "bu/file.h" #include "bu/nids.h" #include "bu/nidsstream.h" diff --git a/src/tests/procs.cpp b/src/tests/procs.cpp index c4b3ebc..c456823 100644 --- a/src/tests/procs.cpp +++ b/src/tests/procs.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "bu/process.h" #include diff --git a/src/tests/rot13.cpp b/src/tests/rot13.cpp index e677440..309707e 100644 --- a/src/tests/rot13.cpp +++ b/src/tests/rot13.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "bu/protocol.h" #include "bu/multiserver.h" #include "bu/client.h" diff --git a/src/tests/serverticks.cpp b/src/tests/serverticks.cpp index 80c4dfa..e599444 100644 --- a/src/tests/serverticks.cpp +++ b/src/tests/serverticks.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "bu/server.h" #include "bu/client.h" #include "bu/protocol.h" diff --git a/src/tests/socketbreak.cpp b/src/tests/socketbreak.cpp index 82069de..e77ae4f 100644 --- a/src/tests/socketbreak.cpp +++ b/src/tests/socketbreak.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "bu/serversocket.h" #include "bu/socket.h" diff --git a/src/tests/stdstream.cpp b/src/tests/stdstream.cpp index 0949a8c..3aa9005 100644 --- a/src/tests/stdstream.cpp +++ b/src/tests/stdstream.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "bu/sio.h" using Bu::sio; diff --git a/src/tests/tracer.cpp b/src/tests/tracer.cpp index a57edf6..797d165 100644 --- a/src/tests/tracer.cpp +++ b/src/tests/tracer.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #define BU_TRACE #include "bu/trace.h" diff --git a/src/tests/url.cpp b/src/tests/url.cpp index 4dc8c46..610a411 100644 --- a/src/tests/url.cpp +++ b/src/tests/url.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "bu/url.h" #include diff --git a/src/tools/nidstool.cpp b/src/tools/nidstool.cpp index d1465ce..5eda877 100644 --- a/src/tools/nidstool.cpp +++ b/src/tools/nidstool.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "bu/file.h" #include "bu/nids.h" #include "bu/nidsstream.h" diff --git a/src/trace.cpp b/src/trace.cpp index b5f11f1..1c03004 100644 --- a/src/trace.cpp +++ b/src/trace.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "bu/trace.h" void Bu::__tracer( const char *pf ) diff --git a/src/unit/file.unit b/src/unit/file.unit index e6320ad..911d8f6 100644 --- a/src/unit/file.unit +++ b/src/unit/file.unit @@ -48,7 +48,7 @@ if( s < 50 ) { unitTest( total == 256 ); - unitTest( sf.isEOS() == true ); + unitTest( sf.isEos() == true ); break; } } @@ -75,7 +75,7 @@ int r = sf.read( buf, 256 ); unitTest( r == 256 ); // You have to read past the end to set the EOS flag. - unitTest( sf.isEOS() == false ); + unitTest( sf.isEos() == false ); try { if( sf.read( buf, 5 ) > 0 ) diff --git a/src/url.cpp b/src/url.cpp index 7f03043..a091e52 100644 --- a/src/url.cpp +++ b/src/url.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "bu/url.h" #ifndef WIN32 # include diff --git a/src/url.h b/src/url.h index 88d128b..465665b 100644 --- a/src/url.h +++ b/src/url.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #ifndef BU_URL_H #define BU_URL_H diff --git a/src/uuid.cpp b/src/uuid.cpp index 8a30e2a..b8de9e1 100644 --- a/src/uuid.cpp +++ b/src/uuid.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "bu/uuid.h" Bu::Uuid::Uuid() diff --git a/src/uuid.h b/src/uuid.h index 2bb1404..ef4f768 100644 --- a/src/uuid.h +++ b/src/uuid.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #ifndef BU_UUID_H #define BU_UUID_H diff --git a/src/win32_compatibility.cpp b/src/win32_compatibility.cpp index c052e0b..c30f4a2 100644 --- a/src/win32_compatibility.cpp +++ b/src/win32_compatibility.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "win32_compatibility.h" #ifdef WIN32 diff --git a/src/xmlreader.cpp b/src/xmlreader.cpp index 12d8dba..c6bc3c9 100644 --- a/src/xmlreader.cpp +++ b/src/xmlreader.cpp @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #include "bu/xmlreader.h" #include "bu/stream.h" @@ -19,7 +26,7 @@ Bu::XmlReader::~XmlReader() void Bu::XmlReader::fillBuffer() { - if( rInput.isEOS() ) + if( rInput.isEos() ) return; char buf[1024]; int iSize = rInput.read( buf, 1024 ); @@ -88,7 +95,7 @@ int Bu::XmlReader::nextToken() { if( j == sBuf.getSize() ) { - if( rInput.isEOS() ) + if( rInput.isEos() ) error("Reached end of input while waiting for whitespace to end."); fillBuffer(); @@ -116,7 +123,7 @@ int Bu::XmlReader::nextToken() { if( j == sBuf.getSize() ) { - if( rInput.isEOS() ) + if( rInput.isEos() ) error("Reached end of input while waiting for a string to end."); fillBuffer(); diff --git a/src/xmlreader.h b/src/xmlreader.h index f2d975b..3b011de 100644 --- a/src/xmlreader.h +++ b/src/xmlreader.h @@ -1,3 +1,10 @@ +/* + * Copyright (C) 2007-2008 Xagasoft, All rights reserved. + * + * This file is part of the libbu++ library and is released under the + * terms of the license contained in the file LICENSE. + */ + #ifndef BU_XML_READER_H #define BU_XML_READER_H -- cgit v1.2.3