diff options
Diffstat (limited to 'libs')
-rw-r--r-- | libs/mediaScan/include/AbstractMedia.h | 2 | ||||
-rw-r--r-- | libs/mediaScan/src/MediainfoReader.cc | 1 | ||||
-rw-r--r-- | libs/networking/include/AbstractSocket.h | 5 | ||||
-rw-r--r-- | libs/networking/include/ConnectionHandler.h | 2 | ||||
-rw-r--r-- | libs/networking/include/Credentials.h | 3 | ||||
-rw-r--r-- | libs/networking/include/HTTPParser.h | 7 | ||||
-rw-r--r-- | libs/networking/include/HTTPRequestHandler.h | 1 | ||||
-rw-r--r-- | libs/networking/include/HTTPResponse.h | 1 | ||||
-rw-r--r-- | libs/networking/include/Principal.h | 4 | ||||
-rw-r--r-- | libs/networking/include/ServerSocket.h | 2 | ||||
-rw-r--r-- | libs/util/include/AbstractListAssembler.h | 1 | ||||
-rw-r--r-- | libs/util/include/Codec.h | 4 | ||||
-rw-r--r-- | libs/util/include/JSonWriter.h | 2 | ||||
-rw-r--r-- | libs/util/include/MD5Calculator.h | 1 | ||||
-rw-r--r-- | libs/util/include/ManagedMap.h | 1 | ||||
-rw-r--r-- | libs/util/include/NamedValue.h | 2 | ||||
-rw-r--r-- | libs/util/include/StringBuilder.h | 2 | ||||
-rw-r--r-- | libs/util/include/util.h | 2 |
18 files changed, 13 insertions, 30 deletions
diff --git a/libs/mediaScan/include/AbstractMedia.h b/libs/mediaScan/include/AbstractMedia.h index b20f9cb..18dd18d 100644 --- a/libs/mediaScan/include/AbstractMedia.h +++ b/libs/mediaScan/include/AbstractMedia.h @@ -33,7 +33,7 @@ typedef struct { const char *extension; const char *mimeType; -} SupportedExtension; + } SupportedExtension; class cAbstractMedia { public: diff --git a/libs/mediaScan/src/MediainfoReader.cc b/libs/mediaScan/src/MediainfoReader.cc index e55b8d9..388c1c3 100644 --- a/libs/mediaScan/src/MediainfoReader.cc +++ b/libs/mediaScan/src/MediainfoReader.cc @@ -80,6 +80,7 @@ cMediainfoReader::InfoEntry *cMediainfoReader::ReadEntry() } line = reader->ReadLine(); } while (line && !rv); + return rv; } diff --git a/libs/networking/include/AbstractSocket.h b/libs/networking/include/AbstractSocket.h index 5a3fa87..67d5da1 100644 --- a/libs/networking/include/AbstractSocket.h +++ b/libs/networking/include/AbstractSocket.h @@ -54,9 +54,8 @@ private: bool blocking; cConnectionPoint *thisSide; ConnectionPointList others; ///< client sockets have only one other side, - ///< but server sockets can have multiple connections open at the same time, - ///< so we probabely need a container here. - // cConnectionPointInfo *FetchLocalInfo(int Socket, struct addrinfo *AI); + ///< but server sockets can have multiple connections open at the same time, + ///< so we probabely need a container here. }; #endif /* ABSTRACTSOCKET_H */ diff --git a/libs/networking/include/ConnectionHandler.h b/libs/networking/include/ConnectionHandler.h index 108a366..bd170ad 100644 --- a/libs/networking/include/ConnectionHandler.h +++ b/libs/networking/include/ConnectionHandler.h @@ -42,12 +42,10 @@ public: virtual ~cConnectionHandler(); void Action(void); - bool AuthorizationRequired(void) { return config.AuthorizationRequired(); } const char *NOnce(void) const { return nonce; } bool StayConnected(void) const { return stayConnected; } virtual void Cancel(int WaitSeconds = 0); - static void RegisterRequestHandler(const char *UrlPrefix, cHTTPRequestHandler *CommandHandler); static void RegisterDefaultHandler(cHTTPRequestHandler *DefaultHandler); static void Cleanup(void); diff --git a/libs/networking/include/Credentials.h b/libs/networking/include/Credentials.h index 44dc17c..8088584 100644 --- a/libs/networking/include/Credentials.h +++ b/libs/networking/include/Credentials.h @@ -39,14 +39,11 @@ public: const cPrincipal *FindPrincipal(const char *Name, const char *Realm); const char *ApplicationRealm(void) const; void SetApplicationRealm(const char *ApplicationRealm = "knownUser@myApp"); - virtual int Load(const char *FileName); virtual int Store(const char *FileName); - void Put(const char *Key, cPrincipal *p); cPrincipal *Get(const char *Key); void Clear(void); - const_iterator begin() { return internalMap.begin(); } const_iterator end() { return internalMap.end(); } diff --git a/libs/networking/include/HTTPParser.h b/libs/networking/include/HTTPParser.h index 2e8b12a..ab5fb4b 100644 --- a/libs/networking/include/HTTPParser.h +++ b/libs/networking/include/HTTPParser.h @@ -28,8 +28,7 @@ class cHTTPMessage; class cHTTPRequest; class cHTTPResponse; -class cHTTPParser -{ +class cHTTPParser { public: cHTTPParser(); virtual ~cHTTPParser(); @@ -39,9 +38,7 @@ public: protected: cHTTPRequest *parseRequest(const char *MessageBuf); cHTTPResponse *parseResponse(const char *MessageBuf); - -private: -}; + }; #endif /* HTTPPARSER_H */ diff --git a/libs/networking/include/HTTPRequestHandler.h b/libs/networking/include/HTTPRequestHandler.h index 9255cae..53b188c 100644 --- a/libs/networking/include/HTTPRequestHandler.h +++ b/libs/networking/include/HTTPRequestHandler.h @@ -35,7 +35,6 @@ public: virtual cHTTPResponse *ProcessRequest(cHTTPRequest &Request) = 0; virtual void Usage(cStringBuilder &sb) = 0; - const char *ID() const { return prefix; } private: diff --git a/libs/networking/include/HTTPResponse.h b/libs/networking/include/HTTPResponse.h index 0bb6d72..e419a49 100644 --- a/libs/networking/include/HTTPResponse.h +++ b/libs/networking/include/HTTPResponse.h @@ -52,7 +52,6 @@ public: virtual void SetContentType(const char *ContentType) { cHTTPMessage::SetContentType(ContentType); } virtual void SetContentSize(size_t ContentSize) { cHTTPMessage::SetContentSize(ContentSize); } cStringBuilder &StringBuilder(void) { return content; } - static const char *ServerID(void); static void SetServerID(const char *ServerID); diff --git a/libs/networking/include/Principal.h b/libs/networking/include/Principal.h index e777946..50693f9 100644 --- a/libs/networking/include/Principal.h +++ b/libs/networking/include/Principal.h @@ -30,18 +30,16 @@ public: cPrincipal(const char *Name, const char *Realm); cPrincipal(const cPrincipal &other); virtual ~cPrincipal(); + cPrincipal &operator =(const cPrincipal &other); const char *operator *(void) { return name; } - void CreateHash(const char *Password); - const char *Name(void) const { return name; } const char *Realm(void) const { return realm; } const char *ExtendedInfo(void) const { return xinfo; } int Age(void) const { return age; } void SetAge(int Age) { age = Age; } const char *Hash(void) const { return hash; } - void Dump(void) const; protected: diff --git a/libs/networking/include/ServerSocket.h b/libs/networking/include/ServerSocket.h index 9133fea..506ae73 100644 --- a/libs/networking/include/ServerSocket.h +++ b/libs/networking/include/ServerSocket.h @@ -46,7 +46,7 @@ public: private: int port; ///< in case we plenty open and close server sockets - ///< we need a place to remember the server port + ///< we need a place to remember the server port bool active; }; 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<int, size_t> &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); |