make check-formatting happy

Author: r00t-

include/ApiIF.hpp

@@ -58,7 +58,7 @@ class ApiIF {
 
   private:
 	Channel::Ptr _ch; /**< pointer to channel where API belongs to */
-};                    // class ApiIF
+}; // class ApiIF
 
 } // namespace vz
 #endif /* _ApiIF_hpp_ */

include/Json.hpp

@@ -11,9 +11,7 @@ class Json {
 	Json(struct json_object *jso) : _jso(jso){};
 	~Json() { _jso = NULL; };
 
-	struct json_object *Object() {
-		return _jso;
-	}
+	struct json_object *Object() { return _jso; }
 
   private:
 	struct json_object *_jso;

src/Meter.cpp

@@ -46,7 +46,7 @@
 #ifdef OMS_SUPPORT
 #include "protocols/MeterOMS.hpp"
 #endif
-//#include <protocols/.h>
+// #include <protocols/.h>
 
 #define METER_DETAIL(NAME, CLASSNAME, DESC, MAX_RDS)                                               \
 	{ meter_protocol_##NAME, #NAME, DESC, MAX_RDS }

src/protocols/MeterD0.cpp

@@ -952,8 +952,8 @@ void MeterD0::dump_file(DUMP_MODE ctrl, const char *str) {
 // snip start
 
 const char hex_asc[] = "0123456789abcdef";
-#define hex_asc_lo(x) hex_asc[((x)&0x0f)]
-#define hex_asc_hi(x) hex_asc[((x)&0xf0) >> 4]
+#define hex_asc_lo(x) hex_asc[((x) & 0x0f)]
+#define hex_asc_hi(x) hex_asc[((x) & 0xf0) >> 4]
 
 static inline char *hex_byte_pack(char *buf, char byte) {
 	*buf++ = hex_asc_hi(byte);

src/protocols/MeterExec.cpp

@@ -28,8 +28,8 @@
 #include <stdlib.h>
 #include <sys/time.h>
 // Regex is not working with gcc-4.6
-//#include <regex>
-//#include <string>
+// #include <regex>
+// #include <string>
 
 #include "Options.hpp"
 #include "protocols/MeterExec.hpp"

src/protocols/MeterS0.cpp

@@ -300,7 +300,7 @@ void MeterS0::counter_thread() {
 				nanosleep(&ts, NULL);              // we can ignore any errors here
 			}
 		} // non blocking case
-	}     // while
+	} // while
 	print(log_finest, "Counter thread stopped with %d imp", name().c_str(), _impulses.load());
 }
 

src/test.cpp

@@ -3,7 +3,7 @@
 #include <cstdio>
 
 #include "common.h"
-//#include "list.h"
+// #include "list.h"
 #include "Buffer.hpp"
 
 // void test_list() {

src/threads.cpp

@@ -148,7 +148,7 @@ void *reading_thread(void *arg) {
 							}
 						}
 
-					}                                                   // channel loop
+					} // channel loop
 			} while ((mtr->aggtime() > 0) && (time(NULL) < aggIntEnd)); /* default aggtime is -1 */
 
 			for (MeterMap::iterator ch = mapping->begin(); ch != mapping->end(); ch++) {