code style

This commit is contained in:
john30
2017-01-14 19:00:47 +01:00
parent ebcb260d5f
commit 5bf2f124b3
42 changed files with 1347 additions and 1066 deletions
+1 -1
View File
@@ -29,4 +29,4 @@
*/
void clockGettime(struct timespec* t);
#endif // LIB_UTILS_CLOCK_H_
#endif // LIB_UTILS_CLOCK_H_
+1 -2
View File
@@ -71,7 +71,6 @@ bool setLogFacilities(const char* facilities) {
newFacilites |= 1 << val;
}
}
//s_lastFacilities = newFacilites;
s_logFacilites = newFacilites;
free(input);
return true;
@@ -81,7 +80,7 @@ bool getLogFacilities(char* buffer) {
if (s_logFacilites == LF_ALL) {
return snprintf(buffer, 48, "%s", facilityNames[lf_COUNT]) != 0;
}
*buffer = 0; // for strcat to work
*buffer = 0; // for strcat to work
bool found = false;
size_t len = 0;
for (int val = 0; val < lf_COUNT; val++) {
+11 -7
View File
@@ -36,12 +36,12 @@ enum LogFacility {
/** the available log levels. */
enum LogLevel {
ll_none = 0, //!< no level at all
ll_none = 0, //!< no level at all
ll_error, //!< error message
ll_notice, //!< important message
ll_info, //!< informational message
ll_debug, //!< debugging message (normally suppressed)
ll_COUNT = 5 //!< number of available log levels
ll_COUNT = 5 //!< number of available log levels
};
/**
@@ -125,15 +125,19 @@ void logWrite(const char* facility, const LogLevel level, const char* message, .
#define logDebug(facility, ...) (needsLog(facility, ll_debug) ? logWrite(facility, ll_debug, __VA_ARGS__) : void(0))
/** A macro for an error message that calls the logging function only if needed. */
#define logOtherError(facility, ...) (needsLog(lf_other, ll_error) ? logWrite(facility, ll_error, __VA_ARGS__) : void(0))
#define logOtherError(facility, ...) \
(needsLog(lf_other, ll_error) ? logWrite(facility, ll_error, __VA_ARGS__) : void(0))
/** A macro for a notice message that calls the logging function only if needed. */
#define logOtherNotice(facility, ...) (needsLog(lf_other, ll_notice) ? logWrite(facility, ll_notice, __VA_ARGS__) : void(0))
#define logOtherNotice(facility, ...) \
(needsLog(lf_other, ll_notice) ? logWrite(facility, ll_notice, __VA_ARGS__) : void(0))
/** A macro for an info message that calls the logging function only if needed. */
#define logOtherInfo(facility, ...) (needsLog(lf_other, ll_info) ? logWrite(facility, ll_info, __VA_ARGS__) : void(0))
#define logOtherInfo(facility, ...) \
(needsLog(lf_other, ll_info) ? logWrite(facility, ll_info, __VA_ARGS__) : void(0))
/** A macro for a debug message that calls the logging function only if needed. */
#define logOtherDebug(facility, ...) (needsLog(lf_other, ll_debug) ? logWrite(facility, ll_debug, __VA_ARGS__) : void(0))
#define logOtherDebug(facility, ...) \
(needsLog(lf_other, ll_debug) ? logWrite(facility, ll_debug, __VA_ARGS__) : void(0))
#endif // LIB_UTILS_LOG_H_
#endif // LIB_UTILS_LOG_H_
+3 -3
View File
@@ -28,7 +28,7 @@
* class to notify other thread per pipe.
*/
class Notify {
public:
public:
/**
* constructs a new instance and do notifying.
*/
@@ -61,7 +61,7 @@ class Notify {
*/
int notify() const { return write(m_sendfd, "1", 1); }
private:
private:
/** file descriptor to watch */
int m_recvfd;
@@ -69,6 +69,6 @@ class Notify {
int m_sendfd;
};
#endif // LIB_UTILS_NOTIFY_H_
#endif // LIB_UTILS_NOTIFY_H_
+5 -5
View File
@@ -34,7 +34,7 @@ using std::list;
*/
template <typename T>
class Queue {
public:
public:
/**
* Constructor.
*/
@@ -52,7 +52,7 @@ class Queue {
}
private:
private:
/**
* Hidden copy constructor.
* @param src the object to copy from.
@@ -60,7 +60,7 @@ class Queue {
Queue(const Queue& src);
public:
public:
/**
* Add an item to the end of queue.
* @param item the item to add.
@@ -141,7 +141,7 @@ class Queue {
}
private:
private:
/** the queue itself */
list<T> m_queue;
@@ -152,4 +152,4 @@ class Queue {
pthread_cond_t m_cond;
};
#endif // LIB_UTILS_QUEUE_H_
#endif // LIB_UTILS_QUEUE_H_
+3 -3
View File
@@ -35,7 +35,7 @@ using std::string;
* Helper class for writing to a rotating file with maximum size.
*/
class RotateFile {
public:
public:
/**
* Construct a new instance.
* @param fileName the name of the file write to.
@@ -72,7 +72,7 @@ class RotateFile {
void write(unsigned char* value, unsigned int size, bool received = true);
private:
private:
/** whether writing to the file is enabled. */
bool m_enabled;
@@ -92,5 +92,5 @@ class RotateFile {
uint64_t m_fileSize;
};
#endif // LIB_UTILS_ROTATEFILE_H_
#endif // LIB_UTILS_ROTATEFILE_H_
+6 -6
View File
@@ -38,7 +38,7 @@ using std::string;
* class for low level tcp socket operations. (open, close, send, receive).
*/
class TCPSocket {
public:
public:
/** grant access for friend class TCPClient */
friend class TCPClient;
@@ -91,7 +91,7 @@ class TCPSocket {
bool isValid();
private:
private:
/** file descriptor from tcp socket */
int m_sfd;
@@ -113,7 +113,7 @@ class TCPSocket {
* class to initiate a tcp socket connection to a listening server.
*/
class TCPClient {
public:
public:
/**
* initiate a tcp socket connection to a listening server.
* @param server the server name or ip address to connect.
@@ -127,7 +127,7 @@ class TCPClient {
* class for a tcp based network server.
*/
class TCPServer {
public:
public:
/**
* creates a new instance of a listening tcp server.
* @param port the tcp port.
@@ -160,7 +160,7 @@ class TCPServer {
int getFD() const { return m_lfd; }
private:
private:
/** file descriptor from listening tcp socket */
int m_lfd;
@@ -174,5 +174,5 @@ class TCPServer {
bool m_listening;
};
#endif // LIB_UTILS_TCPSOCKET_H_
#endif // LIB_UTILS_TCPSOCKET_H_
+6 -6
View File
@@ -27,7 +27,7 @@
* wrapper class for pthread.
*/
class Thread {
public:
public:
/**
* constructor.
*/
@@ -76,14 +76,14 @@ class Thread {
pthread_t self() { return m_threadid; }
protected:
protected:
/**
* Thread entry method to be overridden by derived class.
*/
virtual void run() = 0;
private:
private:
/**
* Enter the Thread loop by calling run().
*/
@@ -107,7 +107,7 @@ class Thread {
* A @a Thread that can be waited on.
*/
class WaitThread : public Thread {
public:
public:
/**
* Constructor.
*/
@@ -132,7 +132,7 @@ class WaitThread : public Thread {
bool Wait(int seconds);
private:
private:
/** the mutex for waiting. */
pthread_mutex_t m_mutex;
@@ -140,4 +140,4 @@ class WaitThread : public Thread {
pthread_cond_t m_cond;
};
#endif // LIB_UTILS_THREAD_H_
#endif // LIB_UTILS_THREAD_H_