From 9dbdeffe0c4b538571c1527aed7f5b2ab0eeb0e3 Mon Sep 17 00:00:00 2001 From: john30 Date: Sat, 7 Nov 2015 14:47:13 +0100 Subject: [PATCH] unified copyright notice --- make_debian.sh | 13 ++--- make_freetz.sh | 13 ++--- src/ebusd/bushandler.cpp | 13 ++--- src/ebusd/bushandler.h | 13 ++--- src/ebusd/main.cpp | 13 ++--- src/ebusd/main.h | 13 ++--- src/ebusd/mainloop.cpp | 13 ++--- src/ebusd/mainloop.h | 13 ++--- src/ebusd/network.cpp | 14 ++--- src/ebusd/network.h | 14 ++--- src/lib/ebus/data.cpp | 13 ++--- src/lib/ebus/data.h | 13 ++--- src/lib/ebus/device.cpp | 13 ++--- src/lib/ebus/device.h | 13 ++--- src/lib/ebus/filereader.h | 13 ++--- src/lib/ebus/message.cpp | 13 ++--- src/lib/ebus/message.h | 13 ++--- src/lib/ebus/result.cpp | 13 ++--- src/lib/ebus/result.h | 13 ++--- src/lib/ebus/symbol.cpp | 13 ++--- src/lib/ebus/symbol.h | 13 ++--- src/lib/ebus/test/test_data.cpp | 13 ++--- src/lib/ebus/test/test_device.cpp | 13 ++--- src/lib/ebus/test/test_message.cpp | 13 ++--- src/lib/ebus/test/test_symbol.cpp | 13 ++--- src/lib/utils/clock.cpp | 89 +++++++++++++++--------------- src/lib/utils/clock.h | 65 +++++++++++----------- src/lib/utils/log.cpp | 13 ++--- src/lib/utils/log.h | 13 ++--- src/lib/utils/notify.h | 14 ++--- src/lib/utils/queue.h | 13 ++--- src/lib/utils/tcpsocket.cpp | 13 ++--- src/lib/utils/tcpsocket.h | 14 ++--- src/lib/utils/thread.cpp | 14 ++--- src/lib/utils/thread.h | 14 ++--- src/tools/ebusctl.cpp | 14 ++--- src/tools/ebusfeed.cpp | 14 ++--- 37 files changed, 286 insertions(+), 331 deletions(-) mode change 100755 => 100644 make_debian.sh mode change 100755 => 100644 make_freetz.sh diff --git a/make_debian.sh b/make_debian.sh old mode 100755 new mode 100644 index 7aab51c1..c645920e --- a/make_debian.sh +++ b/make_debian.sh @@ -1,20 +1,19 @@ #!/bin/sh -# Copyright (C) John Baier 2014-2015 +# ebusd - daemon for communication with eBUS heating systems. +# Copyright (C) 2014-2015 John Baier # -# This file is part of ebusd. -# -# ebusd is free software: you can redistribute it and/or modify +# 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 # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# ebusd is distributed in the hope that it will be useful, +# This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with ebusd. If not, see http://www.gnu.org/licenses/. +# along with this program. If not, see . echo "*************" echo " prepare" diff --git a/make_freetz.sh b/make_freetz.sh old mode 100755 new mode 100644 index ac5d52f7..f98ffb24 --- a/make_freetz.sh +++ b/make_freetz.sh @@ -1,20 +1,19 @@ #!/bin/sh -# Copyright (C) John Baier 2014-2015 +# ebusd - daemon for communication with eBUS heating systems. +# Copyright (C) 2014-2015 John Baier # -# This file is part of ebusd. -# -# ebusd is free software: you can redistribute it and/or modify +# 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 # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# ebusd is distributed in the hope that it will be useful, +# This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with ebusd. If not, see http://www.gnu.org/licenses/. +# along with this program. If not, see . echo "*************" echo " prepare" diff --git a/src/ebusd/bushandler.cpp b/src/ebusd/bushandler.cpp index ba5b0408..0501dea2 100644 --- a/src/ebusd/bushandler.cpp +++ b/src/ebusd/bushandler.cpp @@ -1,20 +1,19 @@ /* - * Copyright (C) John Baier 2014-2015 + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2014-2015 John Baier * - * This file is part of ebusd. - * - * ebusd is free software: you can redistribute it and/or modify + * 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 * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * ebusd is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with ebusd. If not, see http://www.gnu.org/licenses/. + * along with this program. If not, see . */ #include "bushandler.h" diff --git a/src/ebusd/bushandler.h b/src/ebusd/bushandler.h index 4fdbe883..ff0f2b1e 100644 --- a/src/ebusd/bushandler.h +++ b/src/ebusd/bushandler.h @@ -1,20 +1,19 @@ /* - * Copyright (C) John Baier 2014-2015 + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2014-2015 John Baier * - * This file is part of ebusd. - * - * ebusd is free software: you can redistribute it and/or modify + * 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 * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * ebusd is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with ebusd. If not, see http://www.gnu.org/licenses/. + * along with this program. If not, see . */ #ifndef BUSHANDLER_H_ diff --git a/src/ebusd/main.cpp b/src/ebusd/main.cpp index 675b818e..643e73fe 100644 --- a/src/ebusd/main.cpp +++ b/src/ebusd/main.cpp @@ -1,20 +1,19 @@ /* - * Copyright (C) John Baier 2014-2015 + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2014-2015 John Baier * - * This file is part of ebusd. - * - * ebusd is free software: you can redistribute it and/or modify + * 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 * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * ebusd is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with ebusd. If not, see http://www.gnu.org/licenses/. + * along with this program. If not, see . */ #ifdef HAVE_CONFIG_H diff --git a/src/ebusd/main.h b/src/ebusd/main.h index 281b1c18..865f06ab 100644 --- a/src/ebusd/main.h +++ b/src/ebusd/main.h @@ -1,20 +1,19 @@ /* - * Copyright (C) John Baier 2014-2015 + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2014-2015 John Baier * - * This file is part of ebusd. - * - * ebusd is free software: you can redistribute it and/or modify + * 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 * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * ebusd is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with ebusd. If not, see http://www.gnu.org/licenses/. + * along with this program. If not, see . */ #ifndef MAIN_H_ diff --git a/src/ebusd/mainloop.cpp b/src/ebusd/mainloop.cpp index 983af4eb..47fa5954 100644 --- a/src/ebusd/mainloop.cpp +++ b/src/ebusd/mainloop.cpp @@ -1,20 +1,19 @@ /* - * Copyright (C) John Baier 2014-2015 + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2014-2015 John Baier * - * This file is part of ebusd. - * - * ebusd is free software: you can redistribute it and/or modify + * 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 * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * ebusd is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with ebusd. If not, see http://www.gnu.org/licenses/. + * along with this program. If not, see . */ #include "mainloop.h" diff --git a/src/ebusd/mainloop.h b/src/ebusd/mainloop.h index 99dab76c..a254f744 100644 --- a/src/ebusd/mainloop.h +++ b/src/ebusd/mainloop.h @@ -1,20 +1,19 @@ /* - * Copyright (C) John Baier 2014-2015 + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2014-2015 John Baier * - * This file is part of ebusd. - * - * ebusd is free software: you can redistribute it and/or modify + * 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 * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * ebusd is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with ebusd. If not, see http://www.gnu.org/licenses/. + * along with this program. If not, see . */ #ifndef MAINLOOP_H_ diff --git a/src/ebusd/network.cpp b/src/ebusd/network.cpp index f6b33098..c12fa1d8 100644 --- a/src/ebusd/network.cpp +++ b/src/ebusd/network.cpp @@ -1,21 +1,19 @@ /* - * Copyright (C) Roland Jax 2012-2014 , - * John Baier 2014-2015 + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2014-2015 John Baier , Roland Jax 2012-2014 * - * This file is part of ebusd. - * - * ebusd is free software: you can redistribute it and/or modify + * 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 * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * ebusd is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with ebusd. If not, see http://www.gnu.org/licenses/. + * along with this program. If not, see . */ #ifdef HAVE_CONFIG_H diff --git a/src/ebusd/network.h b/src/ebusd/network.h index 5db51ce9..6ff4f75b 100644 --- a/src/ebusd/network.h +++ b/src/ebusd/network.h @@ -1,21 +1,19 @@ /* - * Copyright (C) Roland Jax 2012-2014 , - * John Baier 2014-2015 + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2014-2015 John Baier , Roland Jax 2012-2014 * - * This file is part of ebusd. - * - * ebusd is free software: you can redistribute it and/or modify + * 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 * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * ebusd is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with ebusd. If not, see http://www.gnu.org/licenses/. + * along with this program. If not, see . */ #ifndef NETWORK_H_ diff --git a/src/lib/ebus/data.cpp b/src/lib/ebus/data.cpp index 0ade081b..abd5b5a6 100644 --- a/src/lib/ebus/data.cpp +++ b/src/lib/ebus/data.cpp @@ -1,20 +1,19 @@ /* - * Copyright (C) John Baier 2014-2015 + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2014-2015 John Baier * - * This file is part of ebusd. - * - * ebusd is free software: you can redistribute it and/or modify + * 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 * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * ebusd is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with ebusd. If not, see http://www.gnu.org/licenses/. + * along with this program. If not, see . */ #include "data.h" diff --git a/src/lib/ebus/data.h b/src/lib/ebus/data.h index 7182d3ec..07e85835 100644 --- a/src/lib/ebus/data.h +++ b/src/lib/ebus/data.h @@ -1,20 +1,19 @@ /* - * Copyright (C) John Baier 2014-2015 + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2014-2015 John Baier * - * This file is part of ebusd. - * - * ebusd is free software: you can redistribute it and/or modify + * 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 * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * ebusd is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with ebusd. If not, see http://www.gnu.org/licenses/. + * along with this program. If not, see . */ #ifndef LIBEBUS_DATA_H_ diff --git a/src/lib/ebus/device.cpp b/src/lib/ebus/device.cpp index b54b265a..f7cd7d8c 100644 --- a/src/lib/ebus/device.cpp +++ b/src/lib/ebus/device.cpp @@ -1,20 +1,19 @@ /* - * Copyright (C) John Baier 2015 + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2015 John Baier * - * This file is part of ebusd. - * - * ebusd is free software: you can redistribute it and/or modify + * 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 * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * ebusd is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with ebusd. If not, see http://www.gnu.org/licenses/. + * along with this program. If not, see . */ #ifdef HAVE_CONFIG_H diff --git a/src/lib/ebus/device.h b/src/lib/ebus/device.h index 508dab67..dd191fe7 100644 --- a/src/lib/ebus/device.h +++ b/src/lib/ebus/device.h @@ -1,20 +1,19 @@ /* - * Copyright (C) John Baier 2015 + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2015 John Baier * - * This file is part of ebusd. - * - * ebusd is free software: you can redistribute it and/or modify + * 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 * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * ebusd is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with ebusd. If not, see http://www.gnu.org/licenses/. + * along with this program. If not, see . */ #ifndef LIBEBUS_DEVICE_H_ diff --git a/src/lib/ebus/filereader.h b/src/lib/ebus/filereader.h index 1c3be6e6..34e512b0 100644 --- a/src/lib/ebus/filereader.h +++ b/src/lib/ebus/filereader.h @@ -1,20 +1,19 @@ /* - * Copyright (C) John Baier 2014-2015 + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2014-2015 John Baier * - * This file is part of ebusd. - * - * ebusd is free software: you can redistribute it and/or modify + * 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 * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * ebusd is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with ebusd. If not, see http://www.gnu.org/licenses/. + * along with this program. If not, see . */ #ifndef LIBEBUS_FILEREADER_H_ diff --git a/src/lib/ebus/message.cpp b/src/lib/ebus/message.cpp index 99a965f6..ae01371b 100644 --- a/src/lib/ebus/message.cpp +++ b/src/lib/ebus/message.cpp @@ -1,20 +1,19 @@ /* - * Copyright (C) John Baier 2014-2015 + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2014-2015 John Baier * - * This file is part of ebusd. - * - * ebusd is free software: you can redistribute it and/or modify + * 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 * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * ebusd is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with ebusd. If not, see http://www.gnu.org/licenses/. + * along with this program. If not, see . */ #include "message.h" diff --git a/src/lib/ebus/message.h b/src/lib/ebus/message.h index f16a4bc2..f3ab35ef 100644 --- a/src/lib/ebus/message.h +++ b/src/lib/ebus/message.h @@ -1,20 +1,19 @@ /* - * Copyright (C) John Baier 2014-2015 + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2014-2015 John Baier * - * This file is part of ebusd. - * - * ebusd is free software: you can redistribute it and/or modify + * 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 * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * ebusd is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with ebusd. If not, see http://www.gnu.org/licenses/. + * along with this program. If not, see . */ #ifndef LIBEBUS_MESSAGE_H_ diff --git a/src/lib/ebus/result.cpp b/src/lib/ebus/result.cpp index 16d3a56a..8892c0bb 100644 --- a/src/lib/ebus/result.cpp +++ b/src/lib/ebus/result.cpp @@ -1,20 +1,19 @@ /* - * Copyright (C) John Baier 2014-2015 + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2014-2015 John Baier * - * This file is part of ebusd. - * - * ebusd is free software: you can redistribute it and/or modify + * 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 * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * ebusd is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with ebusd. If not, see http://www.gnu.org/licenses/. + * along with this program. If not, see . */ #include "result.h" diff --git a/src/lib/ebus/result.h b/src/lib/ebus/result.h index 089cafb0..0d10faf7 100644 --- a/src/lib/ebus/result.h +++ b/src/lib/ebus/result.h @@ -1,20 +1,19 @@ /* - * Copyright (C) John Baier 2014-2015 + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2014-2015 John Baier * - * This file is part of ebusd. - * - * ebusd is free software: you can redistribute it and/or modify + * 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 * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * ebusd is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with ebusd. If not, see http://www.gnu.org/licenses/. + * along with this program. If not, see . */ #ifndef LIBEBUS_RESULT_H_ diff --git a/src/lib/ebus/symbol.cpp b/src/lib/ebus/symbol.cpp index 17dd03fa..51b00b3d 100644 --- a/src/lib/ebus/symbol.cpp +++ b/src/lib/ebus/symbol.cpp @@ -1,20 +1,19 @@ /* - * Copyright (C) John Baier 2014-2015 + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2014-2015 John Baier * - * This file is part of ebusd. - * - * ebusd is free software: you can redistribute it and/or modify + * 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 * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * ebusd is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with ebusd. If not, see http://www.gnu.org/licenses/. + * along with this program. If not, see . */ #include "symbol.h" diff --git a/src/lib/ebus/symbol.h b/src/lib/ebus/symbol.h index 8e669ba5..296cbf87 100644 --- a/src/lib/ebus/symbol.h +++ b/src/lib/ebus/symbol.h @@ -1,20 +1,19 @@ /* - * Copyright (C) John Baier 2014-2015 + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2014-2015 John Baier * - * This file is part of ebusd. - * - * ebusd is free software: you can redistribute it and/or modify + * 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 * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * ebusd is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with ebusd. If not, see http://www.gnu.org/licenses/. + * along with this program. If not, see . */ #ifndef LIBEBUS_SYMBOL_H_ diff --git a/src/lib/ebus/test/test_data.cpp b/src/lib/ebus/test/test_data.cpp index 4c66dff6..8da7f5a9 100644 --- a/src/lib/ebus/test/test_data.cpp +++ b/src/lib/ebus/test/test_data.cpp @@ -1,20 +1,19 @@ /* - * Copyright (C) John Baier 2014-2015 + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2014-2015 John Baier * - * This file is part of ebusd. - * - * libebus is free software: you can redistribute it and/or modify + * 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 * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * libebus is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with libebus. If not, see http://www.gnu.org/licenses/. + * along with this program. If not, see . */ #include "data.h" diff --git a/src/lib/ebus/test/test_device.cpp b/src/lib/ebus/test/test_device.cpp index 29b07fbe..2943a075 100644 --- a/src/lib/ebus/test/test_device.cpp +++ b/src/lib/ebus/test/test_device.cpp @@ -1,20 +1,19 @@ /* - * Copyright (C) John Baier 2015 + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2014-2015 John Baier * - * This file is part of ebusd. - * - * ebusd is free software: you can redistribute it and/or modify + * 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 * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * ebusd is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with ebusd. If not, see http://www.gnu.org/licenses/. + * along with this program. If not, see . */ #include "device.h" diff --git a/src/lib/ebus/test/test_message.cpp b/src/lib/ebus/test/test_message.cpp index 0c1989ce..f0ce5f83 100644 --- a/src/lib/ebus/test/test_message.cpp +++ b/src/lib/ebus/test/test_message.cpp @@ -1,20 +1,19 @@ /* - * Copyright (C) John Baier 2014-2015 + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2014-2015 John Baier * - * This file is part of ebusd. - * - * libebus is free software: you can redistribute it and/or modify + * 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 * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * libebus is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with libebus. If not, see http://www.gnu.org/licenses/. + * along with this program. If not, see . */ #include "message.h" diff --git a/src/lib/ebus/test/test_symbol.cpp b/src/lib/ebus/test/test_symbol.cpp index 7540ddf4..1d1cbc9e 100644 --- a/src/lib/ebus/test/test_symbol.cpp +++ b/src/lib/ebus/test/test_symbol.cpp @@ -1,20 +1,19 @@ /* - * Copyright (C) John Baier 2014-2015 + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2014-2015 John Baier * - * This file is part of ebusd. - * - * ebusd is free software: you can redistribute it and/or modify + * 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 * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * ebusd is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with ebusd. If not, see http://www.gnu.org/licenses/. + * along with this program. If not, see . */ #include "symbol.h" diff --git a/src/lib/utils/clock.cpp b/src/lib/utils/clock.cpp index a8474c19..93539e76 100644 --- a/src/lib/utils/clock.cpp +++ b/src/lib/utils/clock.cpp @@ -1,45 +1,44 @@ -/* - * Copyright (C) John Baier 2015 - * - * This file is part of ebusd. - * - * ebusd is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * ebusd is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with ebusd. If not, see http://www.gnu.org/licenses/. - */ - -#include "clock.h" -#ifdef __MACH__ -# include -# include -#endif - -#ifdef __MACH__ -static bool clockInitialized = false; -static clock_serv_t clockServ; -#endif - -void clockGettime(struct timespec* t) -{ -#ifdef __MACH__ - if (!clockInitialized) { - clockInitialized = true; - host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &clockServ); - } - mach_timespec_t mts; - clock_get_time(clockServ, &mts); - t->tv_sec = mts.tv_sec; - t->tv_nsec = mts.tv_nsec; -#else - clock_gettime(CLOCK_REALTIME, t); -#endif -} +/* + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2015 John Baier + * + * 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "clock.h" +#ifdef __MACH__ +# include +# include +#endif + +#ifdef __MACH__ +static bool clockInitialized = false; +static clock_serv_t clockServ; +#endif + +void clockGettime(struct timespec* t) +{ +#ifdef __MACH__ + if (!clockInitialized) { + clockInitialized = true; + host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &clockServ); + } + mach_timespec_t mts; + clock_get_time(clockServ, &mts); + t->tv_sec = mts.tv_sec; + t->tv_nsec = mts.tv_nsec; +#else + clock_gettime(CLOCK_REALTIME, t); +#endif +} diff --git a/src/lib/utils/clock.h b/src/lib/utils/clock.h index c3d9c774..8216cfb8 100644 --- a/src/lib/utils/clock.h +++ b/src/lib/utils/clock.h @@ -1,33 +1,32 @@ -/* - * Copyright (C) John Baier 2015 - * - * This file is part of ebusd. - * - * ebusd is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * ebusd is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with ebusd. If not, see http://www.gnu.org/licenses/. - */ - -#ifndef LIBUTILS_CLOCK_H_ -#define LIBUTILS_CLOCK_H_ - -#include - -/** \file clock.h */ - -/** - * Get the real time system clock. - * @param t the @a timespec in which to store the time. - */ -void clockGettime(struct timespec* t); - -#endif // LIBUTILS_CLOCK_H_ +/* + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2015 John Baier + * + * 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef LIBUTILS_CLOCK_H_ +#define LIBUTILS_CLOCK_H_ + +#include + +/** \file clock.h */ + +/** + * Get the real time system clock. + * @param t the @a timespec in which to store the time. + */ +void clockGettime(struct timespec* t); + +#endif // LIBUTILS_CLOCK_H_ diff --git a/src/lib/utils/log.cpp b/src/lib/utils/log.cpp index 0843012e..5d84ba89 100644 --- a/src/lib/utils/log.cpp +++ b/src/lib/utils/log.cpp @@ -1,20 +1,19 @@ /* - * Copyright (C) John Baier 2014-2015 + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2014-2015 John Baier * - * This file is part of ebusd. - * - * ebusd is free software: you can redistribute it and/or modify + * 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 * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * ebusd is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with ebusd. If not, see http://www.gnu.org/licenses/. + * along with this program. If not, see . */ #include "log.h" diff --git a/src/lib/utils/log.h b/src/lib/utils/log.h index cdcfeaf0..7b20bb27 100644 --- a/src/lib/utils/log.h +++ b/src/lib/utils/log.h @@ -1,20 +1,19 @@ /* - * Copyright (C) John Baier 2014-2015 + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2014-2015 John Baier * - * This file is part of ebusd. - * - * ebusd is free software: you can redistribute it and/or modify + * 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 * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * ebusd is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with ebusd. If not, see http://www.gnu.org/licenses/. + * along with this program. If not, see . */ #ifndef LIBUTILS_LOG_H_ diff --git a/src/lib/utils/notify.h b/src/lib/utils/notify.h index 4f97170d..074b6688 100644 --- a/src/lib/utils/notify.h +++ b/src/lib/utils/notify.h @@ -1,21 +1,19 @@ /* - * Copyright (C) Roland Jax 2012-2014 , - * John Baier 2014-2015 + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2014-2015 John Baier , Roland Jax 2012-2014 * - * This file is part of ebusd. - * - * ebusd is free software: you can redistribute it and/or modify + * 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 * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * ebusd is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with ebusd. If not, see http://www.gnu.org/licenses/. + * along with this program. If not, see . */ #ifndef LIBUTILS_NOTIFY_H_ diff --git a/src/lib/utils/queue.h b/src/lib/utils/queue.h index 30e9715f..56ef5760 100644 --- a/src/lib/utils/queue.h +++ b/src/lib/utils/queue.h @@ -1,20 +1,19 @@ /* - * Copyright (C) John Baier 2014-2015 + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2014-2015 John Baier * - * This file is part of ebusd. - * - * ebusd is free software: you can redistribute it and/or modify + * 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 * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * ebusd is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with ebusd. If not, see http://www.gnu.org/licenses/. + * along with this program. If not, see . */ #ifndef LIBUTILS_QUEUE_H_ diff --git a/src/lib/utils/tcpsocket.cpp b/src/lib/utils/tcpsocket.cpp index 11a79750..4d505933 100644 --- a/src/lib/utils/tcpsocket.cpp +++ b/src/lib/utils/tcpsocket.cpp @@ -1,20 +1,19 @@ /* - * Copyright (C) Roland Jax 2012-2014 + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2015 John Baier , Roland Jax 2012-2014 * - * This file is part of ebusd. - * - * ebusd is free software: you can redistribute it and/or modify + * 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 * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * ebusd is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with ebusd. If not, see http://www.gnu.org/licenses/. + * along with this program. If not, see . */ #include "tcpsocket.h" diff --git a/src/lib/utils/tcpsocket.h b/src/lib/utils/tcpsocket.h index c49ca342..cc4d61d3 100644 --- a/src/lib/utils/tcpsocket.h +++ b/src/lib/utils/tcpsocket.h @@ -1,21 +1,19 @@ /* - * Copyright (C) Roland Jax 2012-2014 , - * John Baier 2015 + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2014-2015 John Baier , Roland Jax 2012-2014 * - * This file is part of ebusd. - * - * ebusd is free software: you can redistribute it and/or modify + * 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 * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * ebusd is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with ebusd. If not, see http://www.gnu.org/licenses/. + * along with this program. If not, see . */ #ifndef LIBUTILS_TCPSOCKET_H_ diff --git a/src/lib/utils/thread.cpp b/src/lib/utils/thread.cpp index 68918fca..31a9a353 100644 --- a/src/lib/utils/thread.cpp +++ b/src/lib/utils/thread.cpp @@ -1,21 +1,19 @@ /* - * Copyright (C) Roland Jax 2012-2014 , - * John Baier 2014-2015 + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2014-2015 John Baier , Roland Jax 2012-2014 * - * This file is part of ebusd. - * - * ebusd is free software: you can redistribute it and/or modify + * 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 * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * ebusd is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with ebusd. If not, see http://www.gnu.org/licenses/. + * along with this program. If not, see . */ #ifdef HAVE_CONFIG_H diff --git a/src/lib/utils/thread.h b/src/lib/utils/thread.h index 05e25bc0..e52c63ac 100644 --- a/src/lib/utils/thread.h +++ b/src/lib/utils/thread.h @@ -1,21 +1,19 @@ /* - * Copyright (C) Roland Jax 2012-2014 , - * John Baier 2014-2015 + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2014-2015 John Baier , Roland Jax 2012-2014 * - * This file is part of ebusd. - * - * ebusd is free software: you can redistribute it and/or modify + * 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 * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * ebusd is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with ebusd. If not, see http://www.gnu.org/licenses/. + * along with this program. If not, see . */ #ifndef LIBUTILS_THREAD_H_ diff --git a/src/tools/ebusctl.cpp b/src/tools/ebusctl.cpp index 46d40e4f..53b4f92c 100644 --- a/src/tools/ebusctl.cpp +++ b/src/tools/ebusctl.cpp @@ -1,21 +1,19 @@ /* - * Copyright (C) Roland Jax 2012-2014 , - * John Baier 2014-2015 + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2014-2015 John Baier , Roland Jax 2012-2014 * - * This file is part of ebusd. - * - * ebusd is free software: you can redistribute it and/or modify + * 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 * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * ebusd is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with ebusd. If not, see http://www.gnu.org/licenses/. + * along with this program. If not, see . */ #ifdef HAVE_CONFIG_H diff --git a/src/tools/ebusfeed.cpp b/src/tools/ebusfeed.cpp index d1f532e8..66a3aaeb 100644 --- a/src/tools/ebusfeed.cpp +++ b/src/tools/ebusfeed.cpp @@ -1,21 +1,19 @@ /* - * Copyright (C) Roland Jax 2012-2014 , - * John Baier 2014-2015 + * ebusd - daemon for communication with eBUS heating systems. + * Copyright (C) 2014-2015 John Baier , Roland Jax 2012-2014 * - * This file is part of ebusd. - * - * ebusd is free software: you can redistribute it and/or modify + * 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 * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * ebusd is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with ebusd. If not, see http://www.gnu.org/licenses/. + * along with this program. If not, see . */ #ifdef HAVE_CONFIG_H