Module: check_mk Branch: master Commit: 72db20cde91259edab7016c92187eaffc322205d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72db20cde91259… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Mon Sep 8 15:10:17 2014 +0200 Remove some trailing spaces in Windows agent --- Makefile | 2 +- agents/windows/check_mk_agent.cc | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 847971e..9ccd4aa 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ LIVESTATUS_SOURCES = configure aclocal.m4 config.guess config.h.in config.sub \ # Files that are checked for trailing spaces HEAL_SPACES_IN = checkman/* modules/* checks/* notifications/* inventory/* \ - $$(find -name Makefile) livestatus/src/*{cc,c,h} \ + $$(find -name Makefile) livestatus/src/*{cc,c,h} agents/windows/*.cc \ web/htdocs/*.{py,css} web/htdocs/js/*.js web/plugins/*/*.py \ doc/helpers/* scripts/setup.sh scripts/autodetect.py \ $$(find pnp-templates -type f -name "*.php") \ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 2bbfe69..2e45de0 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -599,7 +599,7 @@ void df_output_filesystem(SOCKET &out, char *volid) if (total.QuadPart > 0) perc_used = 100 - (100 * free_avail.QuadPart / total.QuadPart); - if (volume[0]) // have a volume name + if (volume[0]) // have a volume name char_replace(' ', '_', volume); else strncpy(volume, volid, sizeof(volume)); @@ -1161,7 +1161,7 @@ void process_eventlog_entries(SOCKET &out, const char *logname, char *buffer, EVENTLOGRECORD *event = (EVENTLOGRECORD *)buffer; while (bytesread > 0) { - crash_log(" - record %d: process_eventlog_entries bytesread %d, event->Length %d", *record_number, bytesread, event->Length); + crash_log(" - record %d: process_eventlog_entries bytesread %d, event->Length %d", *record_number, bytesread, event->Length); *record_number = event->RecordNumber; char type_char; @@ -1973,7 +1973,7 @@ void update_or_create_logwatch_textfile(const char *full_filename, glob_token* t } // Process a single expression (token) of a globline and try to find matching files -void process_glob_expression(glob_token *glob_token, condition_patterns_t *patterns) +void process_glob_expression(glob_token *glob_token, condition_patterns_t *patterns) { WIN32_FIND_DATA data; char full_filename[512]; @@ -2068,7 +2068,7 @@ bool globmatch(const char *pattern, char *astring); // Remove missing files from list void cleanup_logwatch_textfiles() -{ +{ for (logwatch_textfiles_t::iterator it_tf = g_logwatch_textfiles.begin(); it_tf != g_logwatch_textfiles.end();) { if ((*it_tf)->missing) { @@ -2081,7 +2081,7 @@ void cleanup_logwatch_textfiles() } // Called on program exit -void cleanup_logwatch() +void cleanup_logwatch() { // cleanup textfiles for (logwatch_textfiles_t::iterator it_tf = g_logwatch_textfiles.begin(); @@ -2755,7 +2755,7 @@ int launch_program(script_container* cont) while (out_offset + bread > current_heap_size) { // Increase heap buffer if (current_heap_size * 2 <= HEAP_BUFFER_MAX) { - cont->buffer_work = (char *) HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + cont->buffer_work = (char *) HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cont->buffer_work, current_heap_size * 2); current_heap_size = HeapSize(GetProcessHeap(), 0, cont->buffer_work); } @@ -4178,7 +4178,7 @@ void stop_threads() it_cont->second->should_terminate = 1; } it_cont++; - } + } WaitForMultipleObjects(active_thread_count, hThreadArray, TRUE, 5000); TerminateJobObject(g_workers_job_object, 0); } @@ -4366,7 +4366,7 @@ void usage() "check_mk_agent remove -- remove Windows NT service\n" "check_mk_agent adhoc -- open TCP port %d and answer request until killed\n" "check_mk_agent test -- test output of plugin, do not open TCP port\n" - "check_mk_agent debug -- similar to test, but with lots of debug output\n", + "check_mk_agent debug -- similar to test, but with lots of debug output\n", check_mk_version, g_port); exit(1); }