Standardize log message prefix format

The reason for this is to keep a consistency through out the project.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d566f1ea9aac7d60679f6b2e926ccdf6fcf428e..5b91d84edf8d5975ac4a301709a98fbece27e9fc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -244,7 +244,7 @@ set(CMAKE_REQUIRED_FLAGS)
 set(CMAKE_REQUIRED_DEFINITIONS)
 
 if(NOT FOUND_LIBJPEG_TURBO)
-  message(STATUS "WARNING: You are not using libjpeg-turbo. Performance will suffer.")
+  message(STATUS "Warning: You are not using libjpeg-turbo. Performance will suffer.")
 endif()
 
 option(BUILD_JAVA "Build Java version of the TigerVNC Viewer" FALSE)

diff --git a/common/rfb/KeyRemapper.cxx b/common/rfb/KeyRemapper.cxx
index 328955d7a4d1a0538ecc87cd503a0bfb5fc81ef7..1c478178bce2ff1cfbf8473c28c9cd23fae2fe88 100644 (file)
--- a/common/rfb/KeyRemapper.cxx
+++ b/common/rfb/KeyRemapper.cxx
@@ -60,12 +60,12 @@ void KeyRemapper::setMapping(const char* m) {
     if (sscanf(m, "0x%x%c>0x%x", &from,
                &bidi, &to) == 3) {
       if (bidi != '-' && bidi != '<')
-        vlog.error("warning: unknown operation %c>, assuming ->", bidi);
+        vlog.error("Warning: Unknown operation %c>, assuming ->", bidi);
       mapping[from] = to;
       if (bidi == '<')
         mapping[to] = from;
     } else {
-      vlog.error("warning: bad mapping %.*s", (int)(nextComma-m), m);
+      vlog.error("Warning: Bad mapping %.*s", (int)(nextComma-m), m);
     }
     m = nextComma;
     if (nextComma[0])

diff --git a/java/com/jcraft/jsch/ChannelSftp.java b/java/com/jcraft/jsch/ChannelSftp.java
index d2c0913db01fd9168cc8ef35a9094b036e1aefee..58317170b01eb04051bc348fc71e4f7ac8556236 100644 (file)
--- a/java/com/jcraft/jsch/ChannelSftp.java
+++ b/java/com/jcraft/jsch/ChannelSftp.java
@@ -1382,7 +1382,7 @@ public class ChannelSftp extends ChannelSession{
                  try{
                    sendREAD(handle, request_offset, request_len, rq);
                  }
-                 catch(Exception e){ throw new IOException("error"); }
+                 catch(Exception e){ throw new IOException("Error"); }
                  request_offset += request_len;
                }
              }
@@ -1403,11 +1403,11 @@ public class ChannelSftp extends ChannelSession{
                return 0;
              }
              catch(SftpException e){
-               throw new IOException("error: "+e.toString());
+               throw new IOException("Error: "+e.toString());
              }
 
              if(type!=SSH_FXP_STATUS && type!=SSH_FXP_DATA){ 
-               throw new IOException("error");
+               throw new IOException("Error");
              }
              if(type==SSH_FXP_STATUS){
                fill(buf, rest_length);
@@ -1418,7 +1418,7 @@ public class ChannelSftp extends ChannelSession{
                  return -1;
                }
                //throwStatusError(buf, i);
-               throw new IOException("error");
+               throw new IOException("Error");
              }
 
              buf.rewind();
@@ -1477,7 +1477,7 @@ public class ChannelSftp extends ChannelSession{
                             rr.offset+length_of_data,
                             (int)(rr.length-length_of_data), rq);
                  }
-                 catch(Exception e){ throw new IOException("error"); }
+                 catch(Exception e){ throw new IOException("Error"); }
                  request_offset=rr.offset+rr.length;
                }
 
@@ -1502,7 +1502,7 @@ public class ChannelSftp extends ChannelSession{
              if(monitor!=null)monitor.end();
              rq.cancel(header, buf);
              try{_sendCLOSE(handle, header);}
-             catch(Exception e){throw new IOException("error");}
+             catch(Exception e){throw new IOException("Error");}
            }
          };
        return in;

diff --git a/java/com/tigervnc/vncviewer/FileUtils.java b/java/com/tigervnc/vncviewer/FileUtils.java
index 6b82d3e2e659fd04a610c31f9d4354664670bf66..cb5564beac1446584a22ce44eae15bb0428e351f 100644 (file)
--- a/java/com/tigervnc/vncviewer/FileUtils.java
+++ b/java/com/tigervnc/vncviewer/FileUtils.java
@@ -80,7 +80,7 @@ public class FileUtils {
       return newDir.getPath();
     } else {
       if (legacyDir.exists()) {
-        vlog.info("WARNING: ~/.vnc is deprecated, please consult 'man vncviewer' for paths to migrate to.");
+        vlog.info("Warning: ~/.vnc is deprecated, please consult 'man vncviewer' for paths to migrate to.");
         return legacyDir.getPath();
       }
       String xdgBaseDir = System.getenv(xdgEnv);

diff --git a/tests/perf/fbperf.cxx b/tests/perf/fbperf.cxx
index 357aede2bbb7889bf67fcdef6a2def4be8d0a7b6..e4d0febf966e0f363c687ebac83022f3bd6b52f2 100644 (file)
--- a/tests/perf/fbperf.cxx
+++ b/tests/perf/fbperf.cxx
@@ -344,7 +344,7 @@ static void dotest(TestWindow* win)
 
   // We are restricted by some delay, e.g. refresh rate
   if (is_constant(frames[0]/time[0], frames[2]/time[2])) {
-    fprintf(stderr, "WARNING: Fixed delay dominating updates.\n\n");
+    fprintf(stderr, "Warning: Fixed delay dominating updates.\n\n");
     delay = time[2]/frames[2];
     rate = 0.0;
   }
@@ -359,7 +359,7 @@ static void dotest(TestWindow* win)
   // We can hit cache limits that causes performance to drop
   // with increasing update size, screwing up our calculations
   if ((pixels[2] / time[2]) < (pixels[0] / time[0] * 0.9)) {
-    fprintf(stderr, "WARNING: Unexpected behaviour. Measurement unreliable.\n\n");
+    fprintf(stderr, "Warning: Unexpected behaviour. Measurement unreliable.\n\n");
 
     // We can't determine the proportions between these, so divide the
     // time spent evenly

diff --git a/win/rfb_win32/SInput.cxx b/win/rfb_win32/SInput.cxx
index 37144c29c6ae6a5c879fcdf136cf2f4fe5163637..258eb05775d4677b26cea39175a39f5a927971ec 100644 (file)
--- a/win/rfb_win32/SInput.cxx
+++ b/win/rfb_win32/SInput.cxx
@@ -91,7 +91,7 @@ win32::SPointer::pointerEvent(const Point& pos, uint8_t buttonmask)
       if (buttonmask & (1<<i)) {
         flags |= buttonDownMapping[i];
         if (buttonDataMapping[i]) {
-          if (data) vlog.info("warning - two buttons set mouse_event data field");
+          if (data) vlog.info("Warning: Two buttons set mouse_event data field");
           data = buttonDataMapping[i];
         }
       } else {

diff --git a/win/rfb_win32/Service.cxx b/win/rfb_win32/Service.cxx
index be3381da07866337d3fdf99e7ce93e5fcdab4f1b..dbbf6ab61974431608fe994ee9d2bf419c1da5ef 100644 (file)
--- a/win/rfb_win32/Service.cxx
+++ b/win/rfb_win32/Service.cxx
@@ -48,24 +48,24 @@ bool runAsService = false;
 VOID WINAPI serviceHandler(DWORD control) {
   switch (control) {
   case SERVICE_CONTROL_INTERROGATE:
-    vlog.info("cmd: report status");
+    vlog.info("CMD: Report status");
     service->setStatus();
     return;
   case SERVICE_CONTROL_PARAMCHANGE:
-    vlog.info("cmd: param change");
+    vlog.info("CMD: Param change");
     service->readParams();
     return;
   case SERVICE_CONTROL_SHUTDOWN:
-    vlog.info("cmd: OS shutdown");
+    vlog.info("CMD: OS shutdown");
     service->osShuttingDown();
     return;
   case SERVICE_CONTROL_STOP:
-    vlog.info("cmd: stop");
+    vlog.info("CMD: Stop");
     service->setStatus(SERVICE_STOP_PENDING);
     service->stop();
     return;
   };
-  vlog.debug("cmd: unknown %lu", control);
+  vlog.debug("CMD: Unknown %lu", control);
 }
 
 
@@ -126,7 +126,7 @@ Service::setStatus() {
 void
 Service::setStatus(DWORD state) {
   if (status_handle == nullptr) {
-    vlog.debug("warning - cannot setStatus");
+    vlog.debug("Warning: Cannot setStatus");
     return;
   }
   status.dwCurrentState = state;