diff --git a/CMakeLists.txt b/CMakeLists.txt index 59e6c2a0..7a558cdc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ # # Please see COPYING for details # -# Copyright (c) 2005-2018 Brenden Matthews, et. al. (see AUTHORS) All rights +# Copyright (c) 2005-2019 Brenden Matthews, et. al. (see AUTHORS) All rights # reserved. # # This program is free software: you can redistribute it and/or modify it under diff --git a/COPYING b/COPYING index 5095845a..43d62b10 100644 --- a/COPYING +++ b/COPYING @@ -6,5 +6,5 @@ LICENSE for a copy), except where noted differently (such as in portmon and audacious code which are LGPL, and prss which is an MIT-style license). Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen -Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS) +Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS) All rights reserved. diff --git a/LICENSE.BSD b/LICENSE.BSD index 91fe6e12..a24f82f9 100644 --- a/LICENSE.BSD +++ b/LICENSE.BSD @@ -1,5 +1,5 @@ Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen -Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS) +Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS) All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/cmake/Conky.cmake b/cmake/Conky.cmake index 19dd4e46..84b0eee1 100644 --- a/cmake/Conky.cmake +++ b/cmake/Conky.cmake @@ -3,7 +3,7 @@ # # Please see COPYING for details # -# Copyright (c) 2005-2018 Brenden Matthews, et. al. (see AUTHORS) All rights +# Copyright (c) 2005-2019 Brenden Matthews, et. al. (see AUTHORS) All rights # reserved. # # This program is free software: you can redistribute it and/or modify it under @@ -167,7 +167,7 @@ else(RELEASE) "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}_pre${COMMIT_COUNT}") endif(RELEASE) -set(COPYRIGHT "Copyright Brenden Matthews, et al, 2005-2018") +set(COPYRIGHT "Copyright Brenden Matthews, et al, 2005-2019") macro(AC_SEARCH_LIBS FUNCTION_NAME INCLUDES TARGET_VAR) if("${TARGET_VAR}" MATCHES "^${TARGET_VAR}$") diff --git a/cmake/ConkyBuildOptions.cmake b/cmake/ConkyBuildOptions.cmake index da8238cd..566b9725 100644 --- a/cmake/ConkyBuildOptions.cmake +++ b/cmake/ConkyBuildOptions.cmake @@ -3,7 +3,7 @@ # # Please see COPYING for details # -# Copyright (c) 2005-2018 Brenden Matthews, et. al. (see AUTHORS) All rights +# Copyright (c) 2005-2019 Brenden Matthews, et. al. (see AUTHORS) All rights # reserved. # # This program is free software: you can redistribute it and/or modify it under diff --git a/cmake/ConkyCPackSetup.cmake b/cmake/ConkyCPackSetup.cmake index a4d53c1c..e8407339 100644 --- a/cmake/ConkyCPackSetup.cmake +++ b/cmake/ConkyCPackSetup.cmake @@ -3,7 +3,7 @@ # # Please see COPYING for details # -# Copyright (c) 2005-2018 Brenden Matthews, et. al. (see AUTHORS) All rights +# Copyright (c) 2005-2019 Brenden Matthews, et. al. (see AUTHORS) All rights # reserved. # # This program is free software: you can redistribute it and/or modify it under diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake index 024a1910..db24cb20 100644 --- a/cmake/ConkyPlatformChecks.cmake +++ b/cmake/ConkyPlatformChecks.cmake @@ -3,7 +3,7 @@ # # Please see COPYING for details # -# Copyright (c) 2005-2018 Brenden Matthews, et. al. (see AUTHORS) All rights +# Copyright (c) 2005-2019 Brenden Matthews, et. al. (see AUTHORS) All rights # reserved. # # This program is free software: you can redistribute it and/or modify it under diff --git a/cmake/Docbook.cmake b/cmake/Docbook.cmake index 5352107d..e6ffe582 100644 --- a/cmake/Docbook.cmake +++ b/cmake/Docbook.cmake @@ -3,7 +3,7 @@ # # Please see COPYING for details # -# Copyright (c) 2005-2018 Brenden Matthews, et. al. (see AUTHORS) All rights +# Copyright (c) 2005-2019 Brenden Matthews, et. al. (see AUTHORS) All rights # reserved. # # This program is free software: you can redistribute it and/or modify it under diff --git a/cmake/ToLua.cmake b/cmake/ToLua.cmake index 6ba94306..114c40fc 100644 --- a/cmake/ToLua.cmake +++ b/cmake/ToLua.cmake @@ -3,7 +3,7 @@ # # Please see COPYING for details # -# Copyright (c) 2005-2018 Brenden Matthews, et. al. (see AUTHORS) All rights +# Copyright (c) 2005-2019 Brenden Matthews, et. al. (see AUTHORS) All rights # reserved. # # This program is free software: you can redistribute it and/or modify it under diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 412adc3a..0d0b93aa 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -3,7 +3,7 @@ # # Please see COPYING for details # -# Copyright (c) 2005-2018 Brenden Matthews, et. al. (see AUTHORS) All rights +# Copyright (c) 2005-2019 Brenden Matthews, et. al. (see AUTHORS) All rights # reserved. # # This program is free software: you can redistribute it and/or modify it under diff --git a/data/conky-dfly-smp.conf b/data/conky-dfly-smp.conf index f728fc3d..0adc0594 100644 --- a/data/conky-dfly-smp.conf +++ b/data/conky-dfly-smp.conf @@ -8,7 +8,7 @@ All code written since the fork of torsmo is licensed under the GPL Please see COPYING for details Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen -Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS) +Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS) All rights reserved. This program is free software: you can redistribute it and/or modify diff --git a/data/conky.conf b/data/conky.conf index 327e19d8..c83ccb03 100644 --- a/data/conky.conf +++ b/data/conky.conf @@ -8,7 +8,7 @@ All code written since the fork of torsmo is licensed under the GPL Please see COPYING for details Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen -Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS) +Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS) All rights reserved. This program is free software: you can redistribute it and/or modify diff --git a/data/conky_no_x11.conf b/data/conky_no_x11.conf index bfd3a9a2..05c4364f 100644 --- a/data/conky_no_x11.conf +++ b/data/conky_no_x11.conf @@ -7,7 +7,7 @@ -- Please see COPYING for details -- Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen --- Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS) +-- Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS) -- All rights reserved. -- This program is free software: you can redistribute it and/or modify diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index dcbcbb88..d14f8ea5 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -3,7 +3,7 @@ # # Please see COPYING for details # -# Copyright (c) 2005-2018 Brenden Matthews, et. al. (see AUTHORS) All rights +# Copyright (c) 2005-2019 Brenden Matthews, et. al. (see AUTHORS) All rights # reserved. # # This program is free software: you can redistribute it and/or modify it under diff --git a/doc/docs.xml b/doc/docs.xml index db92c73e..c70c0c39 100644 --- a/doc/docs.xml +++ b/doc/docs.xml @@ -249,7 +249,7 @@ Copying - Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. Any original torsmo code is licensed under the BSD license (see LICENSE.BSD for a copy). All code written since the fork of torsmo is licensed under the GPL (see LICENSE.GPL for a copy), except where diff --git a/lua/CMakeLists.txt b/lua/CMakeLists.txt index d35b0216..3f1cfb5c 100644 --- a/lua/CMakeLists.txt +++ b/lua/CMakeLists.txt @@ -3,7 +3,7 @@ # # Please see COPYING for details # -# Copyright (c) 2005-2018 Brenden Matthews, et. al. (see AUTHORS) All rights +# Copyright (c) 2005-2019 Brenden Matthews, et. al. (see AUTHORS) All rights # reserved. # # This program is free software: you can redistribute it and/or modify it under diff --git a/lua/libcairo-helper.h b/lua/libcairo-helper.h index 7f5cb152..6612d9f0 100644 --- a/lua/libcairo-helper.h +++ b/lua/libcairo-helper.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/lua/libcairo_imlib2_helper.h b/lua/libcairo_imlib2_helper.h index 6e96a2a7..92a18de4 100644 --- a/lua/libcairo_imlib2_helper.h +++ b/lua/libcairo_imlib2_helper.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/lua/librsvg-helper.h b/lua/librsvg-helper.h index 2d960f6a..9d115a53 100644 --- a/lua/librsvg-helper.h +++ b/lua/librsvg-helper.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a34fef01..dfc4b7e5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,7 +3,7 @@ # # Please see COPYING for details # -# Copyright (c) 2005-2018 Brenden Matthews, et. al. (see AUTHORS) All rights +# Copyright (c) 2005-2019 Brenden Matthews, et. al. (see AUTHORS) All rights # reserved. # # This program is free software: you can redistribute it and/or modify it under diff --git a/src/algebra.cc b/src/algebra.cc index 9385b646..4ad4790f 100644 --- a/src/algebra.cc +++ b/src/algebra.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/algebra.h b/src/algebra.h index c80b8b17..e38e13cb 100644 --- a/src/algebra.h +++ b/src/algebra.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/bsdapm.cc b/src/bsdapm.cc index fb10112e..98ded12b 100644 --- a/src/bsdapm.cc +++ b/src/bsdapm.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/bsdapm.h b/src/bsdapm.h index 59061d87..d7da690b 100644 --- a/src/bsdapm.h +++ b/src/bsdapm.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/ccurl_thread.cc b/src/ccurl_thread.cc index 6cb58b18..6d3c151b 100644 --- a/src/ccurl_thread.cc +++ b/src/ccurl_thread.cc @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/ccurl_thread.h b/src/ccurl_thread.h index 03ae15f6..62576cce 100644 --- a/src/ccurl_thread.h +++ b/src/ccurl_thread.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/colours.cc b/src/colours.cc index f40befd4..c04fb99e 100644 --- a/src/colours.cc +++ b/src/colours.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/colours.h b/src/colours.h index ec34d775..0a468771 100644 --- a/src/colours.h +++ b/src/colours.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/combine.cc b/src/combine.cc index 2d6ba125..dcc156be 100644 --- a/src/combine.cc +++ b/src/combine.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/combine.h b/src/combine.h index 29e18ad1..2f62a135 100644 --- a/src/combine.h +++ b/src/combine.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/common.cc b/src/common.cc index 44f71b00..040c4b90 100644 --- a/src/common.cc +++ b/src/common.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/common.h b/src/common.h index 1759d1d4..a7a575b3 100644 --- a/src/common.h +++ b/src/common.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/conky.cc b/src/conky.cc index 95743c43..a448d496 100644 --- a/src/conky.cc +++ b/src/conky.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/conky.h b/src/conky.h index fce31125..3f172a25 100644 --- a/src/conky.h +++ b/src/conky.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/core.cc b/src/core.cc index 7cd4e307..b99ed843 100644 --- a/src/core.cc +++ b/src/core.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/core.h b/src/core.h index d1c58fee..cc358ddb 100644 --- a/src/core.h +++ b/src/core.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/cpu.cc b/src/cpu.cc index b6627502..70ee5505 100644 --- a/src/cpu.cc +++ b/src/cpu.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/cpu.h b/src/cpu.h index c8f26fa3..906007c4 100644 --- a/src/cpu.h +++ b/src/cpu.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/darwin.h b/src/darwin.h index 6f9a1101..d25ccbda 100644 --- a/src/darwin.h +++ b/src/darwin.h @@ -7,7 +7,7 @@ * * Please see COPYING for details * - * Copyright (c) 2018, npyl + * Copyright (c) 2018-2019, npyl * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/darwin.mm b/src/darwin.mm index 8d97f29f..7159c745 100644 --- a/src/darwin.mm +++ b/src/darwin.mm @@ -7,7 +7,7 @@ * * Please see COPYING for details * - * Copyright (c) 2018, npyl + * Copyright (c) 2018-2019, npyl * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -232,7 +232,7 @@ static void get_cpu_sample(struct cpusample **sample) { natural_t processorCount; processor_cpu_load_info_t processorTickInfo; mach_msg_type_number_t processorInfoCount; - + machHost = mach_host_self(); kern_return_t err = host_processor_info( @@ -275,14 +275,14 @@ static void get_cpu_sample(struct cpusample **sample) { void allocate_cpu_sample(struct cpusample **sample) { if (*sample != nullptr) return; - + /* * allocate ncpus+1 cpusample structs (one foreach CPU) * ** sample_handle[0] is overal CPU usage */ *sample = reinterpret_cast(malloc(sizeof(cpusample) * (info.cpu_count + 1))); memset(*sample, 0, sizeof(cpusample) * (info.cpu_count + 1)); - + sample_handle = *sample; /* use a public handle for deallocating */ } @@ -580,9 +580,9 @@ uint64_t get_physical_memory() { } int update_meminfo() { - + /* XXX See #34 */ - + vm_size_t page_size = getpagesize(); // get pagesize in bytes unsigned long swap_avail, swap_free; @@ -654,7 +654,7 @@ int update_meminfo() { void update_wlan_stats(struct net_stat *ns) { CWWiFiClient *client = [CWWiFiClient sharedWiFiClient]; CWInterface *interface = [client interfaceWithName:[NSString stringWithUTF8String:ns->dev]]; - + if (!interface) return; @@ -699,7 +699,7 @@ void update_wlan_stats(struct net_stat *ns) { default: break; } - + /* * Setup */ @@ -737,7 +737,7 @@ int update_net_stats() { #ifdef BUILD_WLAN update_wlan_stats(ns); #endif - + ns->up = 1; last_recv = ns->recv; last_trans = ns->trans; @@ -949,7 +949,7 @@ int update_cpu_usage() { static struct cpu_info *cpu = nullptr; unsigned int malloc_cpu_size = 0; extern void *global_cpu; - + static struct cpusample *sample = nullptr; static pthread_mutex_t last_stat_update_mutex = PTHREAD_MUTEX_INITIALIZER; @@ -983,7 +983,7 @@ int update_cpu_usage() { } allocate_cpu_sample(&sample); - + get_cpu_sample(&sample); /* @@ -1063,27 +1063,27 @@ void get_acpi_fan(char * /*p_client_buffer*/, size_t /*client_buffer_size*/) { char get_freq(char *p_client_buffer, size_t client_buffer_size, const char *p_format, int divisor, unsigned int cpu) { (void)cpu; - + if ((p_client_buffer == nullptr) || client_buffer_size <= 0 || (p_format == nullptr) || divisor <= 0) { return 0; } - + #ifdef BUILD_IPGFREQ /* * Our data is always the same for every core, so ignore |cpu| argument. */ - + static bool initialised = false; - + if (!initialised) { IntelEnergyLibInitialize(); initialised = true; } - + int freq = 0; GetIAFrequency(cpu, &freq); - + snprintf(p_client_buffer, client_buffer_size, p_format, static_cast(freq) / divisor); #else @@ -1092,21 +1092,21 @@ char get_freq(char *p_client_buffer, size_t client_buffer_size, * (Also, it is always the same for every core, so ignore |cpu| argument) * Enable BUILD_IPGFREQ for getting current frequency. */ - + int mib[2]; unsigned int freq; size_t len; - + mib[0] = CTL_HW; mib[1] = HW_CPU_FREQ; len = sizeof(freq); - + if (sysctl(mib, 2, &freq, &len, nullptr, 0) == 0) { /* * convert to MHz */ divisor *= 1000000; - + snprintf(p_client_buffer, client_buffer_size, p_format, static_cast(freq) / divisor); } else { @@ -1114,7 +1114,7 @@ char get_freq(char *p_client_buffer, size_t client_buffer_size, return 0; } #endif - + return 1; } @@ -1159,9 +1159,9 @@ static void calc_cpu_usage_for_proc(struct process *proc, uint64_t total) { static void calc_cpu_total(struct process *proc, uint64_t *total) { uint64_t current_total = 0; /* of current iteration */ struct cpusample *sample = nullptr; - + allocate_cpu_sample(&sample); - + get_cpu_sample(&sample); current_total = sample[0].totalUserTime + sample[0].totalIdleTime + sample[0].totalSystemTime; diff --git a/src/darwin_sip.h b/src/darwin_sip.h index 3e555433..dfa68cae 100644 --- a/src/darwin_sip.h +++ b/src/darwin_sip.h @@ -7,7 +7,7 @@ * * Please see COPYING for details * - * Copyright (c) 2018, npyl + * Copyright (c) 2018-2019, npyl * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/diskio.cc b/src/diskio.cc index 5208865b..3acb7a04 100644 --- a/src/diskio.cc +++ b/src/diskio.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/diskio.h b/src/diskio.h index 0a38b2ba..552d7221 100644 --- a/src/diskio.h +++ b/src/diskio.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/entropy.cc b/src/entropy.cc index c4a55442..08988fd8 100644 --- a/src/entropy.cc +++ b/src/entropy.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/entropy.h b/src/entropy.h index f91d6ff6..81eb7d7f 100644 --- a/src/entropy.h +++ b/src/entropy.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/exec.cc b/src/exec.cc index 323f2df4..b998f657 100644 --- a/src/exec.cc +++ b/src/exec.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/exec.h b/src/exec.h index e1cdf7b8..14e1b886 100644 --- a/src/exec.h +++ b/src/exec.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/fonts.cc b/src/fonts.cc index 0e1b7389..fb335a8b 100644 --- a/src/fonts.cc +++ b/src/fonts.cc @@ -10,7 +10,7 @@ ad_ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/fonts.h b/src/fonts.h index 29de7e85..9ba1e4d6 100644 --- a/src/fonts.h +++ b/src/fonts.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/freebsd.cc b/src/freebsd.cc index 00c7dc30..503b96c1 100644 --- a/src/freebsd.cc +++ b/src/freebsd.cc @@ -8,7 +8,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/freebsd.h b/src/freebsd.h index 7680e1b1..d7ee9953 100644 --- a/src/freebsd.h +++ b/src/freebsd.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/fs.cc b/src/fs.cc index f2258df0..c10fae7a 100644 --- a/src/fs.cc +++ b/src/fs.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/fs.h b/src/fs.h index 4da9985b..2f3086ba 100644 --- a/src/fs.h +++ b/src/fs.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/haiku.cc b/src/haiku.cc index 6138374a..22f59033 100644 --- a/src/haiku.cc +++ b/src/haiku.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/hddtemp.cc b/src/hddtemp.cc index 57068905..c65a6429 100644 --- a/src/hddtemp.cc +++ b/src/hddtemp.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/hddtemp.h b/src/hddtemp.h index 0b088b75..390e65c8 100644 --- a/src/hddtemp.h +++ b/src/hddtemp.h @@ -5,7 +5,7 @@ * Please see COPYING for details * * Copyright (c) 2007 Toni Spets - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/i18n.h b/src/i18n.h index 2fabe5b4..cb66f3fb 100644 --- a/src/i18n.h +++ b/src/i18n.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/i8k.cc b/src/i8k.cc index 1928e63a..8b08c0b1 100644 --- a/src/i8k.cc +++ b/src/i8k.cc @@ -10,7 +10,7 @@ * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen * Copyright (c) 2007 Toni Spets - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/i8k.h b/src/i8k.h index 20afe5a2..eee92d7c 100644 --- a/src/i8k.h +++ b/src/i8k.h @@ -10,7 +10,7 @@ * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen * Copyright (c) 2007 Toni Spets - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/ibm.cc b/src/ibm.cc index 840f5c39..31b2afaa 100644 --- a/src/ibm.cc +++ b/src/ibm.cc @@ -10,7 +10,7 @@ * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen * Copyright (c) 2007 Toni Spets - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/ibm.h b/src/ibm.h index 17c49f10..b6945fea 100644 --- a/src/ibm.h +++ b/src/ibm.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/ical.cc b/src/ical.cc index 79ef568c..c8b951e2 100644 --- a/src/ical.cc +++ b/src/ical.cc @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/ical.h b/src/ical.h index 2af9a550..dae4cfd1 100644 --- a/src/ical.h +++ b/src/ical.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/iconv_tools.cc b/src/iconv_tools.cc index cc7130b3..9ba2a96b 100644 --- a/src/iconv_tools.cc +++ b/src/iconv_tools.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/iconv_tools.h b/src/iconv_tools.h index a80b7175..c4fe60f2 100644 --- a/src/iconv_tools.h +++ b/src/iconv_tools.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/imlib2.cc b/src/imlib2.cc index a92c7978..70faade7 100644 --- a/src/imlib2.cc +++ b/src/imlib2.cc @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, et. al. * All rights reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/imlib2.h b/src/imlib2.h index 4c3bf975..076ac205 100644 --- a/src/imlib2.h +++ b/src/imlib2.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, et. al. * All rights reserved. * * This program is free software: you can redistribute it and/or modify diff --git a/src/irc.cc b/src/irc.cc index bc4c7b6e..380cc3e3 100644 --- a/src/irc.cc +++ b/src/irc.cc @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/irc.h b/src/irc.h index 90c5f2dd..9d2342b8 100644 --- a/src/irc.h +++ b/src/irc.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/journal.cc b/src/journal.cc index eed6db75..e9a3758e 100644 --- a/src/journal.cc +++ b/src/journal.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/journal.h b/src/journal.h index 4d035aea..ad3ae369 100644 --- a/src/journal.h +++ b/src/journal.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/linux.cc b/src/linux.cc index ffd21171..0a7d4331 100644 --- a/src/linux.cc +++ b/src/linux.cc @@ -6,7 +6,7 @@ * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen * Copyright (c) 2007 Toni Spets - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/linux.h b/src/linux.h index 1943cc93..4bcdfac3 100644 --- a/src/linux.h +++ b/src/linux.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/llua.cc b/src/llua.cc index 6a62c821..edc4dc7d 100644 --- a/src/llua.cc +++ b/src/llua.cc @@ -3,7 +3,7 @@ * Conky, a system monitor, based on torsmo * * Copyright (c) 2009 Toni Spets - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/llua.h b/src/llua.h index 9435930f..b6bcaa7a 100644 --- a/src/llua.h +++ b/src/llua.h @@ -3,7 +3,7 @@ * Conky, a system monitor, based on torsmo * * Copyright (c) 2009 Toni Spets - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/logging.h b/src/logging.h index 72bd7616..927a0053 100644 --- a/src/logging.h +++ b/src/logging.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/mail.cc b/src/mail.cc index 138c312e..a9be07f1 100644 --- a/src/mail.cc +++ b/src/mail.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/mail.h b/src/mail.h index c3a94d1f..7bea7682 100644 --- a/src/mail.h +++ b/src/mail.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/main.cc b/src/main.cc index 51cb8f1a..806b1259 100644 --- a/src/main.cc +++ b/src/main.cc @@ -8,7 +8,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/main.h b/src/main.h index 17c91a44..9ab175a5 100644 --- a/src/main.h +++ b/src/main.h @@ -8,7 +8,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/mboxscan.cc b/src/mboxscan.cc index 3f7948bb..4293c074 100644 --- a/src/mboxscan.cc +++ b/src/mboxscan.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2006 Marco Candrian - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/mboxscan.h b/src/mboxscan.h index e55f5f74..43c3830c 100644 --- a/src/mboxscan.h +++ b/src/mboxscan.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2006 Marco Candrian - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/mixer.cc b/src/mixer.cc index 16ba0c39..a707794a 100644 --- a/src/mixer.cc +++ b/src/mixer.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/mixer.h b/src/mixer.h index 648b4f07..f4585ffb 100644 --- a/src/mixer.h +++ b/src/mixer.h @@ -10,7 +10,7 @@ * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen * Copyright (c) 2007 Toni Spets - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/mpd.cc b/src/mpd.cc index 0e1f6366..1647c7db 100644 --- a/src/mpd.cc +++ b/src/mpd.cc @@ -8,7 +8,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/mpd.h b/src/mpd.h index 672f8396..db4e08a7 100644 --- a/src/mpd.h +++ b/src/mpd.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/mysql.cc b/src/mysql.cc index 7d4824e2..bf94dac5 100644 --- a/src/mysql.cc +++ b/src/mysql.cc @@ -8,7 +8,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/mysql.h b/src/mysql.h index 29320ac8..28835919 100644 --- a/src/mysql.h +++ b/src/mysql.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/nc.cc b/src/nc.cc index 2e785861..513eb7fc 100644 --- a/src/nc.cc +++ b/src/nc.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/nc.h b/src/nc.h index 192aadb1..0b5936fe 100644 --- a/src/nc.h +++ b/src/nc.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/net_stat.cc b/src/net_stat.cc index 63a6461c..57775348 100644 --- a/src/net_stat.cc +++ b/src/net_stat.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/net_stat.h b/src/net_stat.h index fdf55ac4..3a7698e5 100644 --- a/src/net_stat.h +++ b/src/net_stat.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/netbsd.cc b/src/netbsd.cc index 4d59c9d4..43b82ada 100644 --- a/src/netbsd.cc +++ b/src/netbsd.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/nvidia.cc b/src/nvidia.cc index c81f7dc8..6dc1e0ca 100644 --- a/src/nvidia.cc +++ b/src/nvidia.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2008 Markus Meissner - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/nvidia.h b/src/nvidia.h index 5cfa1d6f..957ecbde 100644 --- a/src/nvidia.h +++ b/src/nvidia.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2008 Markus Meissner - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/openbsd.cc b/src/openbsd.cc index 870be362..69a8cfb0 100644 --- a/src/openbsd.cc +++ b/src/openbsd.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2007 Toni Spets - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/proc.cc b/src/proc.cc index e6d80068..4df31f8e 100644 --- a/src/proc.cc +++ b/src/proc.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/proc.h b/src/proc.h index 9bb96083..6c2579a2 100644 --- a/src/proc.h +++ b/src/proc.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/pulseaudio.cc b/src/pulseaudio.cc index 738471c1..c753c8e0 100644 --- a/src/pulseaudio.cc +++ b/src/pulseaudio.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/pulseaudio.h b/src/pulseaudio.h index b58a34ff..fcae4fc0 100644 --- a/src/pulseaudio.h +++ b/src/pulseaudio.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/read_tcpip.cc b/src/read_tcpip.cc index 73cb7dbf..946be55b 100644 --- a/src/read_tcpip.cc +++ b/src/read_tcpip.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/read_tcpip.h b/src/read_tcpip.h index b1e96a1a..b4a17536 100644 --- a/src/read_tcpip.h +++ b/src/read_tcpip.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/rss.cc b/src/rss.cc index 32272b56..266bbc4a 100644 --- a/src/rss.cc +++ b/src/rss.cc @@ -5,7 +5,7 @@ * Please see COPYING for details * * Copyright (c) 2007 Toni Spets - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/rss.h b/src/rss.h index d2dc170a..c18a9469 100644 --- a/src/rss.h +++ b/src/rss.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/scroll.cc b/src/scroll.cc index fb2feaf4..c6007ccf 100644 --- a/src/scroll.cc +++ b/src/scroll.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/scroll.h b/src/scroll.h index 9260417a..888ca5e8 100644 --- a/src/scroll.h +++ b/src/scroll.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/solaris.cc b/src/solaris.cc index eee15160..a146dd52 100644 --- a/src/solaris.cc +++ b/src/solaris.cc @@ -8,7 +8,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/sony.cc b/src/sony.cc index ff9514a1..2e2735b1 100644 --- a/src/sony.cc +++ b/src/sony.cc @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * Copyright (c) 2009 Yeon-Hyeong Yang * (see AUTHORS) * All rights reserved. diff --git a/src/sony.h b/src/sony.h index 907fa7a8..cd5831b1 100644 --- a/src/sony.h +++ b/src/sony.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * Copyright (c) 2009 Yeon-Hyeong Yang * (see AUTHORS) * All rights reserved. diff --git a/src/specials.cc b/src/specials.cc index bec8fc0f..f5167c5e 100644 --- a/src/specials.cc +++ b/src/specials.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/specials.h b/src/specials.h index d396d4f2..573c318a 100644 --- a/src/specials.h +++ b/src/specials.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/tailhead.cc b/src/tailhead.cc index 2f1aa63d..56e63b9e 100644 --- a/src/tailhead.cc +++ b/src/tailhead.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/tailhead.h b/src/tailhead.h index 9f7b80e5..5fa64e70 100644 --- a/src/tailhead.h +++ b/src/tailhead.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/template.cc b/src/template.cc index 8d3f11d4..84f9a9cd 100644 --- a/src/template.cc +++ b/src/template.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/template.h b/src/template.h index 1b0bbf0c..8db13409 100644 --- a/src/template.h +++ b/src/template.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/text_object.cc b/src/text_object.cc index 49c43c15..4a1aa050 100644 --- a/src/text_object.cc +++ b/src/text_object.cc @@ -8,7 +8,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/text_object.h b/src/text_object.h index 01dc3276..88c4b236 100644 --- a/src/text_object.h +++ b/src/text_object.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/timeinfo.cc b/src/timeinfo.cc index 0f03e2b5..cbf07e17 100644 --- a/src/timeinfo.cc +++ b/src/timeinfo.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/timeinfo.h b/src/timeinfo.h index 5954dac5..10321706 100644 --- a/src/timeinfo.h +++ b/src/timeinfo.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/top.cc b/src/top.cc index 8b45bb7b..b37092d3 100644 --- a/src/top.cc +++ b/src/top.cc @@ -10,7 +10,7 @@ * * Copyright (c) 2005 Adi Zaimi, Dan Piponi , * Dave Clark - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/top.h b/src/top.h index 6936a54d..f37321a7 100644 --- a/src/top.h +++ b/src/top.h @@ -10,7 +10,7 @@ * * Copyright (c) 2005 Adi Zaimi, Dan Piponi , * Dave Clark - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/user.cc b/src/user.cc index 2c8fdc41..6b24b838 100644 --- a/src/user.cc +++ b/src/user.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/user.h b/src/user.h index e4ecb0da..73c63120 100644 --- a/src/user.h +++ b/src/user.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/users.cc b/src/users.cc index 30d0c398..c73a71c8 100644 --- a/src/users.cc +++ b/src/users.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/users.h b/src/users.h index 7637ce13..961ef445 100644 --- a/src/users.h +++ b/src/users.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/weather.cc b/src/weather.cc index dbc1cfb2..7abafdde 100644 --- a/src/weather.cc +++ b/src/weather.cc @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/weather.h b/src/weather.h index 38d73c5b..e33f3455 100644 --- a/src/weather.h +++ b/src/weather.h @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/x11.cc b/src/x11.cc index 1d75ff4a..3d98a705 100644 --- a/src/x11.cc +++ b/src/x11.cc @@ -9,7 +9,7 @@ * Please see COPYING for details * * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/x11.h b/src/x11.h index b86e038e..20348efa 100644 --- a/src/x11.h +++ b/src/x11.h @@ -4,7 +4,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/xmms2.cc b/src/xmms2.cc index 6cee3eb1..f37e71a9 100644 --- a/src/xmms2.cc +++ b/src/xmms2.cc @@ -8,7 +8,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/src/xmms2.h b/src/xmms2.h index 5c30d7f9..245f748f 100644 --- a/src/xmms2.h +++ b/src/xmms2.h @@ -8,7 +8,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/tests/catch2/catch.hpp b/tests/catch2/catch.hpp index 5d4cbbe5..4d991eee 100644 --- a/tests/catch2/catch.hpp +++ b/tests/catch2/catch.hpp @@ -131,7 +131,7 @@ namespace Catch { /* Disable C++17 on older GCC versions. */ #if defined(__GNUC__) && !defined(_GLIBCXX_RELEASE) -#undef CATCH_CPP17_OR_GREATER +#undef CATCH_CPP17_OR_GREATER #endif #endif diff --git a/tests/test-common.cc b/tests/test-common.cc index 8c9564af..c98361fb 100644 --- a/tests/test-common.cc +++ b/tests/test-common.cc @@ -8,7 +8,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/tests/test-darwin.cc b/tests/test-darwin.cc index 98041b15..83118e45 100644 --- a/tests/test-darwin.cc +++ b/tests/test-darwin.cc @@ -8,7 +8,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. * diff --git a/tests/test-linux.cc b/tests/test-linux.cc index 8f03321a..4ee707f0 100644 --- a/tests/test-linux.cc +++ b/tests/test-linux.cc @@ -8,7 +8,7 @@ * * Please see COPYING for details * - * Copyright (c) 2005-2018 Brenden Matthews, Philip Kovacs, et. al. + * Copyright (c) 2005-2019 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) * All rights reserved. *