From 816f3e001271ed8ab7fdadb6d90aeb2c61362dac Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Wed, 8 Dec 2010 14:51:47 +0100 Subject: removal of C++isms from libabrt, part 1 This patch converts libabrt usage of C++ map to a glib-based container, GHashTable. It is typedef-ed to map_string_h. We can't typedef it to map_string_t, since other parts of ABRT (daemon, cli) still use that name for C++ container. Also, exceptions are removed everywhere. Signed-off-by: Denys Vlasenko --- src/include/plugin.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/include/plugin.h') diff --git a/src/include/plugin.h b/src/include/plugin.h index 3f652e65..322c212f 100644 --- a/src/include/plugin.h +++ b/src/include/plugin.h @@ -76,6 +76,7 @@ typedef enum { REPORTER, /**< A reporter plugin*/ DATABASE, /**< A database plugin*/ MAX_PLUGIN_TYPE = DATABASE, + INVALID_PLUGIN_TYPE } plugin_type_t; /** -- cgit From df1b1d501106687fcf0039dc9771c4455c346df5 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Wed, 22 Dec 2010 13:57:14 +0100 Subject: *: rename *crash_dump.* -> *crash_data.* Signed-off-by: Denys Vlasenko --- src/include/plugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/include/plugin.h') diff --git a/src/include/plugin.h b/src/include/plugin.h index 322c212f..e3f1f81f 100644 --- a/src/include/plugin.h +++ b/src/include/plugin.h @@ -23,7 +23,7 @@ #define PLUGIN_H_ #include "abrt_types.h" -#include "abrt_crash_dump.h" +#include "abrt_crash_data.h" #define PLUGINS_MAGIC_NUMBER 6 -- cgit From 480cac7647d567c3c3cb148c5a4750091b651934 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Wed, 19 Jan 2011 17:14:05 +0100 Subject: remove old plugin machinery. -10k and -1 library dependence in abrtd Signed-off-by: Denys Vlasenko --- src/include/plugin.h | 84 ---------------------------------------------------- 1 file changed, 84 deletions(-) (limited to 'src/include/plugin.h') diff --git a/src/include/plugin.h b/src/include/plugin.h index e3f1f81f..5af5753c 100644 --- a/src/include/plugin.h +++ b/src/include/plugin.h @@ -25,90 +25,6 @@ #include "abrt_types.h" #include "abrt_crash_data.h" -#define PLUGINS_MAGIC_NUMBER 6 - #define PLUGINS_CONF_EXTENSION "conf" -#define PLUGINS_LIB_EXTENSION "so" -#define PLUGINS_LIB_PREFIX "lib" - -/** - * An abstract class. The class defines a common plugin interface. If a plugin - * has some settings, then a *Settings(*) method has to be written. - */ -class CPlugin -{ - protected: - map_plugin_settings_t m_pSettings; - - public: - CPlugin(); - /** - * A destructor. - */ - virtual ~CPlugin(); - /** - * A method, which initializes a plugin. It is not mandatory method. - */ - virtual void Init(); - /** - * A method, which deinitializes a plugin. It is not mandatory method. - */ - virtual void DeInit(); - /** - * A method, which takes a settings and apply them. It is not a mandatory method. - * @param pSettings Plugin's settings - */ - virtual void SetSettings(const map_plugin_settings_t& pSettings); - /** - * A method, which return current settings. It is not mandatory method. - * @return Plugin's settings - */ -/// -// virtual const map_plugin_settings_t& GetSettings(); -}; - -/** - * An enum of plugin types. - */ -typedef enum { - ANALYZER, /**< An analyzer plugin*/ - ACTION, /**< An action plugin*/ - REPORTER, /**< A reporter plugin*/ - DATABASE, /**< A database plugin*/ - MAX_PLUGIN_TYPE = DATABASE, - INVALID_PLUGIN_TYPE -} plugin_type_t; - -/** - * A struct contains all needed data about particular plugin. - */ -typedef struct SPluginInfo -{ - const plugin_type_t m_Type; /**< Plugin type.*/ - const char *const m_sName; /**< Plugin name.*/ - const char *const m_sVersion; /**< Plugin version.*/ - const char *const m_sDescription; /**< Plugin description.*/ - const char *const m_sEmail; /**< Plugin author's email.*/ - const char *const m_sWWW; /**< Plugin's home page.*/ - const char *const m_sGTKBuilder; /**< Plugin's gui description.*/ - const int m_nMagicNumber; /**< Plugin magical number.*/ -} plugin_info_t; - -#define PLUGIN_INFO(type, plugin_class, name, version, description, email, www, gtk_builder)\ - extern "C" CPlugin* plugin_new()\ - {\ - return new plugin_class();\ - }\ - extern "C" const plugin_info_t plugin_info =\ - {\ - type,\ - name,\ - version,\ - description,\ - email,\ - www,\ - gtk_builder,\ - PLUGINS_MAGIC_NUMBER,\ - }; #endif -- cgit From 320724188859d96b0a974d9e84bacd49a614f97d Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Thu, 20 Jan 2011 21:43:54 +0100 Subject: remove plugin.h, move its only macro into into only user Signed-off-by: Denys Vlasenko --- src/include/plugin.h | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 src/include/plugin.h (limited to 'src/include/plugin.h') diff --git a/src/include/plugin.h b/src/include/plugin.h deleted file mode 100644 index 5af5753c..00000000 --- a/src/include/plugin.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - Plugin.h - header file for plugin. It contains mandatory macros - and common function for plugins - - Copyright (C) 2009 Zdenek Prikryl (zprikryl@redhat.com) - Copyright (C) 2009 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. -*/ -#ifndef PLUGIN_H_ -#define PLUGIN_H_ - -#include "abrt_types.h" -#include "abrt_crash_data.h" - -#define PLUGINS_CONF_EXTENSION "conf" - -#endif -- cgit