From 5e04292eb7545b06cc7ea66605eda8342f220b15 Mon Sep 17 00:00:00 2001 From: geronimo Date: Tue, 31 Jul 2012 07:18:44 +0200 Subject: cleanup --- libs/util/include/AbstractListAssembler.h | 1 - libs/util/include/Codec.h | 4 ++-- libs/util/include/JSonWriter.h | 2 +- libs/util/include/MD5Calculator.h | 1 - libs/util/include/ManagedMap.h | 1 - libs/util/include/NamedValue.h | 2 +- libs/util/include/StringBuilder.h | 2 -- libs/util/include/util.h | 2 +- 8 files changed, 5 insertions(+), 10 deletions(-) (limited to 'libs/util') diff --git a/libs/util/include/AbstractListAssembler.h b/libs/util/include/AbstractListAssembler.h index d709249..352d71b 100644 --- a/libs/util/include/AbstractListAssembler.h +++ b/libs/util/include/AbstractListAssembler.h @@ -36,7 +36,6 @@ public: virtual ~cAbstractListAssembler(); bool AssembleList(cStringBuilder &sb, cManagedVector &ElemVector, std::map &Categories, size_t start = 0, uint delta = 40); - virtual const char *MediaType(void) const = 0; protected: diff --git a/libs/util/include/Codec.h b/libs/util/include/Codec.h index ceaea70..e792294 100644 --- a/libs/util/include/Codec.h +++ b/libs/util/include/Codec.h @@ -46,7 +46,7 @@ public: cEncoder(char SpecialChar = '#', const char *TrTable = "0123456789ABCDEF"); virtual ~cEncoder(); char *Encode(const char *Source, size_t SourceLength = 0); ///< encode Source, - ///< optionally limited by SourceLength (default is to encode a 0-terminated cstring) + ///< optionally limited by SourceLength (default is to encode a 0-terminated cstring) }; class cURLEncoder : public cEncoder { @@ -60,7 +60,7 @@ public: cDecoder(char KeyChar = '#', const char *TrTable = "0123456789ABCDEF"); virtual ~cDecoder(); char *Decode(const char *Source, size_t SourceLength = 0); ///< decode Source, - ///< optionally limited by SourceLength (default is to decode a 0-terminated cstring) + ///< optionally limited by SourceLength (default is to decode a 0-terminated cstring) virtual size_t DecodeSequence(unsigned char *d, unsigned char *s); }; diff --git a/libs/util/include/JSonWriter.h b/libs/util/include/JSonWriter.h index 8031565..13810cc 100644 --- a/libs/util/include/JSonWriter.h +++ b/libs/util/include/JSonWriter.h @@ -51,7 +51,7 @@ private: JS_Object, JS_Array, JS_Key - } JSonState; + } JSonState; cJSonWriter::JSonState State(void); void PushState(JSonState State); cJSonWriter::JSonState PopState(void); diff --git a/libs/util/include/MD5Calculator.h b/libs/util/include/MD5Calculator.h index 0dca5d4..cfcf60b 100644 --- a/libs/util/include/MD5Calculator.h +++ b/libs/util/include/MD5Calculator.h @@ -33,7 +33,6 @@ public: virtual ~cMD5Calculator(); void AddContent(const char *Buf, size_t bufSize = 0); - char *Hash(void); void Reset(void); diff --git a/libs/util/include/ManagedMap.h b/libs/util/include/ManagedMap.h index e8f04f7..04f8670 100644 --- a/libs/util/include/ManagedMap.h +++ b/libs/util/include/ManagedMap.h @@ -40,7 +40,6 @@ public: void *get(const char *key); const void *get(const char *key) const; size_t size(void) { return internalMap.size(); } - const_iterator begin() const { return internalMap.begin(); } const_iterator end() const { return internalMap.end(); } diff --git a/libs/util/include/NamedValue.h b/libs/util/include/NamedValue.h index 8730d3d..5384904 100644 --- a/libs/util/include/NamedValue.h +++ b/libs/util/include/NamedValue.h @@ -36,8 +36,8 @@ public: cNamedValue(const char *Name, const char *Value = NULL); cNamedValue(const cNamedValue &other); virtual ~cNamedValue(); + cNamedValue &operator =(const cNamedValue &other); - const char *Name() const { return name; } const char *Value() const { return value; } void SetValue(const char *Value) { free(value); value = strdup(Value); } diff --git a/libs/util/include/StringBuilder.h b/libs/util/include/StringBuilder.h index a0e7259..db98934 100644 --- a/libs/util/include/StringBuilder.h +++ b/libs/util/include/StringBuilder.h @@ -41,13 +41,11 @@ public: cStringBuilder &Append(int v); cStringBuilder &Append(long v); cStringBuilder &Append(size_t s); - void Clear(void); size_t Size(void); size_t Size(void) const; void Rewind(void) { readOffset = 0; } size_t Copy(char *Buf, size_t BufSize); - char *toString(void); private: diff --git a/libs/util/include/util.h b/libs/util/include/util.h index e0855db..023c435 100644 --- a/libs/util/include/util.h +++ b/libs/util/include/util.h @@ -34,7 +34,7 @@ #define ASSERT_NOT(rv, x) if (x == rv) { fprintf(stderr, "assertation failed at %s #%d\n",__FILE__,__LINE__); exit(-1); } #define FAIL(s) { fprintf(stderr, s); exit(-1); } -extern const char * skipWhitespace(const char *Buffer); +extern const char *skipWhitespace(const char *Buffer); extern const char *getWord(char *buf, int bufSize, const char *src); extern const char *restOfLine(char *buf, int bufSize, const char *src); -- cgit v1.2.3