From 5b74bf1bbd4aef9f71ef76b718c79fe7b09bf5f5 Mon Sep 17 00:00:00 2001 From: Madeleine Nilsson Date: Mon, 4 Nov 2024 14:59:46 +0100 Subject: [PATCH] Standardize log message prefix format The reason for this is to keep a consistency through out the project. --- CMakeLists.txt | 2 +- common/rfb/KeyRemapper.cxx | 4 ++-- java/com/jcraft/jsch/ChannelSftp.java | 12 ++++++------ java/com/tigervnc/vncviewer/FileUtils.java | 2 +- tests/perf/fbperf.cxx | 4 ++-- win/rfb_win32/SInput.cxx | 2 +- win/rfb_win32/Service.cxx | 12 ++++++------ 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d566f1e..5b91d84e 100644 --- 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 328955d7..1c478178 100644 --- 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 d2c0913d..58317170 100644 --- 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 6b82d3e2..cb5564be 100644 --- 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 357aede2..e4d0febf 100644 --- 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 37144c29..258eb057 100644 --- 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<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; -- 2.39.5