Remove CCrashWatcher and CObserver classes; merge libabrt_daemon into abrtd

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>

2 files changed, 0 insertions, 113 deletions

diff --git a/src/lib/CommLayerInner.cpp b/src/lib/CommLayerInner.cpp
deleted file mode 100644
index 3c102d6e..00000000
--- a/src/lib/CommLayerInner.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-    Copyright (C) 2010  ABRT team
-    Copyright (C) 2010  RedHat Inc
-
-    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 Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-#include <pthread.h>
-#include <map>
-#include "abrtlib.h"
-#include "comm_layer_inner.h"
-
-static CObserver *s_pObs;
-
-typedef std::map<uint64_t, std::string> map_uint_str_t;
-static map_uint_str_t s_mapClientID;
-static pthread_mutex_t s_map_mutex;
-static bool s_map_mutex_inited;
-
-/* called via [p]error_msg() */
-static void warn_client(const char *msg)
-{
-    if (!s_pObs)
-        return;
-
-    uint64_t key = uint64_t(pthread_self());
-
-    pthread_mutex_lock(&s_map_mutex);
-    map_uint_str_t::const_iterator ki = s_mapClientID.find(key);
-    const char* peer = (ki != s_mapClientID.end() ? ki->second.c_str() : NULL);
-    pthread_mutex_unlock(&s_map_mutex);
-
-    if (peer)
-        s_pObs->Warning(msg, peer);
-}
-
-void init_daemon_logging(CObserver *pObs)
-{
-    s_pObs = pObs;
-    if (!s_map_mutex_inited)
-    {
-        s_map_mutex_inited = true;
-        pthread_mutex_init(&s_map_mutex, NULL);
-        g_custom_logger = &warn_client;
-    }
-}
-
-void set_client_name(const char *name)
-{
-    uint64_t key = uint64_t(pthread_self());
-
-    pthread_mutex_lock(&s_map_mutex);
-    if (!name) {
-        s_mapClientID.erase(key);
-    } else {
-        s_mapClientID[key] = name;
-    }
-    pthread_mutex_unlock(&s_map_mutex);
-}
-
-void update_client(const char *fmt, ...)
-{
-    if (!s_pObs)
-        return;
-
-    uint64_t key = uint64_t(pthread_self());
-
-    pthread_mutex_lock(&s_map_mutex);
-    map_uint_str_t::const_iterator ki = s_mapClientID.find(key);
-    const char* peer = (ki != s_mapClientID.end() ? ki->second.c_str() : NULL);
-    pthread_mutex_unlock(&s_map_mutex);
-
-    if (!peer)
-        return;
-
-    va_list p;
-    va_start(p, fmt);
-    char *msg = xvasprintf(fmt, p);
-    va_end(p);
-
-    s_pObs->Status(msg, peer);
-    free(msg);
-}
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index ce06795a..89cad8ab 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,10 +1,8 @@
 # libreport - the stuff shared among most of abrt (like xmalloc, logging)
-# libabrt_daemon - only daemon related things are here
 # libabrt_dbus - daemon, cli and applet use this
 # libabrt_web - for abrt-action-foo where foo deals with network/web/ftp/...
 lib_LTLIBRARIES = \
     libreport.la \
-    libabrt_daemon.la \
     libabrt_dbus.la \
     libabrt_web.la
 
@@ -78,23 +76,6 @@ libabrt_dbus_la_LIBADD = \
     $(GLIB_LIBS) \
     $(DBUS_LIBS)
 
-libabrt_daemon_la_SOURCES = \
-    CommLayerInner.cpp
-libabrt_daemon_la_CPPFLAGS = \
-    -I$(srcdir)/../include/report -I$(srcdir)/../include \
-    -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
-    -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
-    -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
-    -DCONF_DIR=\"$(CONF_DIR)\" \
-    -DVAR_RUN=\"$(VAR_RUN)\" \
-    $(GLIB_CFLAGS) \
-    -Wall \
-    -Werror \
-    -D_GNU_SOURCE
-libabrt_daemon_la_LDFLAGS = \
-    -version-info 0:1:0
-libabrt_daemon_la_LIBADD =
-
 libabrt_web_la_SOURCES = \
     abrt_curl.h abrt_curl.c \
     abrt_xmlrpc.h abrt_xmlrpc.cpp