From 5d75becca9452af1de9322d8633a91f77537ffc7 Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Sat, 15 Nov 2014 19:42:03 +0100 Subject: [PATCH] remove error.{cpp,h} --- src/Makefile.am | 2 -- src/error.cpp | 46 ---------------------------------------------- src/error.h | 29 ----------------------------- 3 files changed, 77 deletions(-) delete mode 100644 src/error.cpp delete mode 100644 src/error.h diff --git a/src/Makefile.am b/src/Makefile.am index bd4579d2..4e4530b7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,7 +15,6 @@ ncmpcpp_SOURCES = \ curl_handle.cpp \ display.cpp \ enums.cpp \ - error.cpp \ format.cpp \ global.cpp \ help.cpp \ @@ -73,7 +72,6 @@ noinst_HEADERS = \ curl_handle.h \ display.h \ enums.h \ - error.h \ format.h \ global.h \ help.h \ diff --git a/src/error.cpp b/src/error.cpp deleted file mode 100644 index 4a49375e..00000000 --- a/src/error.cpp +++ /dev/null @@ -1,46 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2008-2014 by Andrzej Rybczak * - * electricityispower@gmail.com * - * * - * 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 2 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, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -#include -#include -#include - -#include "error.h" - -namespace -{ - const char *Timestamp() - { - static char result[32]; - time_t raw; - tm *t; - time(&raw); - t = localtime(&raw); - result[strftime(result, 31, "%Y/%m/%d %X", t)] = 0; - return result; - } -} - -void FatalError(const std::string &msg) -{ - std::cerr << "[" << Timestamp() << "] " << msg << std::endl; - abort(); -} - diff --git a/src/error.h b/src/error.h deleted file mode 100644 index ed36578c..00000000 --- a/src/error.h +++ /dev/null @@ -1,29 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2008-2014 by Andrzej Rybczak * - * electricityispower@gmail.com * - * * - * 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 2 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, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * - ***************************************************************************/ - -#ifndef NCMPCPP_ERROR_H -#define NCMPCPP_ERROR_H - -#include -#include "gcc.h" - -void FatalError(const std::string &msg) GNUC_NORETURN; - -#endif // NCMPCPP_ERROR_H