general indent beautification

2016-03-10 23:36:16 +01:00
parent d139c42d17
commit 5279d247ca
110 changed files with 21778 additions and 21525 deletions
--- a/src/utils/logger.cpp
+++ b/src/utils/logger.cpp
@@ -28,90 +28,90 @@ using std::ios;
 using std::endl;

 namespace epics {
-    namespace pvAccess {
-        
-        #define TIMETEXTLEN 32
-        
-        static pvAccessLogLevel g_pvAccessLogLevel = logLevelInfo;
-        
-        void pvAccessLog(pvAccessLogLevel level, const char* format, ...)
-        {
-            // TODO lock
-            if (level >= g_pvAccessLogLevel)
-            {
-                char timeText[TIMETEXTLEN];
-                epicsTimeStamp tsNow;
-    
-                epicsTimeGetCurrent(&tsNow);
-                epicsTimeToStrftime(timeText, TIMETEXTLEN, "%Y-%m-%dT%H:%M:%S.%03f", &tsNow);
-    
-                printf("%s ", timeText);
+namespace pvAccess {

-                va_list arg;
-                va_start(arg, format);
-                vprintf(format, arg);
-                va_end(arg);
+#define TIMETEXTLEN 32

-                printf("\n");
-				fflush(stdout);    // needed for WIN32
-            }
-        }
+static pvAccessLogLevel g_pvAccessLogLevel = logLevelInfo;

-        void pvAccessSetLogLevel(pvAccessLogLevel level)
-        {
-            g_pvAccessLogLevel = level;
-        }
+void pvAccessLog(pvAccessLogLevel level, const char* format, ...)
+{
+    // TODO lock
+    if (level >= g_pvAccessLogLevel)
+    {
+        char timeText[TIMETEXTLEN];
+        epicsTimeStamp tsNow;

-        bool pvAccessIsLoggable(pvAccessLogLevel level)
-        {
-            return level >= g_pvAccessLogLevel;
-        }
+        epicsTimeGetCurrent(&tsNow);
+        epicsTimeToStrftime(timeText, TIMETEXTLEN, "%Y-%m-%dT%H:%M:%S.%03f", &tsNow);

-        class FileLogger : public NoDefaultMethods {
-        public:
-            FileLogger(std::string const & name) {
-                logFile.open(name.data(), ios::app);
-            }
+        printf("%s ", timeText);

-            ~FileLogger() {
-                logFile.close();
-            }
-
-            void logMessage(const char* message) {
-                time_t rawtime;
-                time(&rawtime);
-                char* timeStr = ctime(&rawtime);
-                timeStr[strlen(timeStr)-1]='\0'; // remove newline
-
-                logFile<<timeStr<<"\t"<<message; // the newline is added by the caller
-            }
-        private:
-            ofstream logFile;
-
-        };
-
-        static FileLogger* fileLogger = NULL;
-
-        static void errLogFileListener(void* /*pPrivate*/, const char *message) {
-            fileLogger->logMessage(message);
-        }
-
-        static void exitFileLoggerHandler(void* /*pPrivate*/) {
-            errlogFlush();
-            delete fileLogger;
-        }
-
-        void createFileLogger(std::string const & fname) {
-            static Mutex mutex;
-            Lock xx(mutex);
-
-            if(fileLogger==NULL) {
-                fileLogger = new FileLogger(fname);
-                errlogInit(2048);
-                errlogAddListener(errLogFileListener, NULL);
-                epicsAtExit(exitFileLoggerHandler, NULL);
-            }
-        }
+        va_list arg;
+        va_start(arg, format);
+        vprintf(format, arg);
+        va_end(arg);

+        printf("\n");
+        fflush(stdout);    // needed for WIN32
    }
 }
+
+void pvAccessSetLogLevel(pvAccessLogLevel level)
+{
+    g_pvAccessLogLevel = level;
+}
+
+bool pvAccessIsLoggable(pvAccessLogLevel level)
+{
+    return level >= g_pvAccessLogLevel;
+}
+
+class FileLogger : public NoDefaultMethods {
+public:
+    FileLogger(std::string const & name) {
+        logFile.open(name.data(), ios::app);
+    }
+
+    ~FileLogger() {
+        logFile.close();
+    }
+
+    void logMessage(const char* message) {
+        time_t rawtime;
+        time(&rawtime);
+        char* timeStr = ctime(&rawtime);
+        timeStr[strlen(timeStr)-1]='\0'; // remove newline
+
+        logFile<<timeStr<<"\t"<<message; // the newline is added by the caller
+    }
+private:
+    ofstream logFile;
+
+};
+
+static FileLogger* fileLogger = NULL;
+
+static void errLogFileListener(void* /*pPrivate*/, const char *message) {
+    fileLogger->logMessage(message);
+}
+
+static void exitFileLoggerHandler(void* /*pPrivate*/) {
+    errlogFlush();
+    delete fileLogger;
+}
+
+void createFileLogger(std::string const & fname) {
+    static Mutex mutex;
+    Lock xx(mutex);
+
+    if(fileLogger==NULL) {
+        fileLogger = new FileLogger(fname);
+        errlogInit(2048);
+        errlogAddListener(errLogFileListener, NULL);
+        epicsAtExit(exitFileLoggerHandler, NULL);
+    }
+}
+
+}
+}