From edb61e36ba19aece2d253b2df9650addb3244b10 Mon Sep 17 00:00:00 2001 From: Zdenek Prikryl Date: Thu, 5 Feb 2009 12:30:22 +0100 Subject: Settings functions moved to proper place --- lib/MiddleWare/Makefile.am | 2 +- lib/MiddleWare/Settings.cpp | 84 +++++++++++++++++++++++++++++++++++++++++++++ lib/MiddleWare/Settings.h | 34 ++++++++++++++++++ lib/Utils/Settings.cpp | 84 --------------------------------------------- lib/Utils/Settings.h | 34 ------------------ 5 files changed, 119 insertions(+), 119 deletions(-) create mode 100644 lib/MiddleWare/Settings.cpp create mode 100644 lib/MiddleWare/Settings.h delete mode 100644 lib/Utils/Settings.cpp delete mode 100644 lib/Utils/Settings.h diff --git a/lib/MiddleWare/Makefile.am b/lib/MiddleWare/Makefile.am index aafb842..1b1b5f4 100644 --- a/lib/MiddleWare/Makefile.am +++ b/lib/MiddleWare/Makefile.am @@ -2,7 +2,7 @@ lib_LTLIBRARIES = libMiddleWare.la libMiddleWare_la_SOURCES = MiddleWare.cpp MiddleWare.h PluginManager.cpp \ PluginManager.h CrashCatcherPlugin.cpp \ CrashCatcherPlugin.h DynamicLibrary.cpp \ - DynamicLibrary.h + DynamicLibrary.h Settings.h Settings.cpp libMiddleWare_la_LIBADD = $(DL_LIBS) ../Utils/libUtils.la libMiddleWare_la_LDFLAGS = -version-info 0:1:0 libMiddleWare_la_CPPFLAGS = -I$(srcdir)/../Utils diff --git a/lib/MiddleWare/Settings.cpp b/lib/MiddleWare/Settings.cpp new file mode 100644 index 0000000..627bfc6 --- /dev/null +++ b/lib/MiddleWare/Settings.cpp @@ -0,0 +1,84 @@ +/* + Settings.cpp - header file for settings functions + + 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. + */ + +#include "Settings.h" +#include + + +void load_settings(const std::string& path, map_settings_t& settings) +{ + std::ifstream fIn; + fIn.open(path.c_str()); + if (fIn.is_open()) + { + std::string line; + while (!fIn.eof()) + { + getline(fIn, line); + + int ii; + bool is_value = false; + bool valid = false; + std::string key = ""; + std::string value = ""; + for (ii = 0; ii < line.length(); ii++) + { + if (isspace(line[ii])) + { + continue; + } + if (line[ii] == '#') + { + break; + } + else if (line[ii] == '=') + { + is_value = true; + } + else if (line[ii] == '=' && is_value) + { + key = ""; + value = ""; + break; + } + else if (!is_value) + { + key += line[ii]; + } + else + { + valid = true; + value += line[ii]; + } + } + if (valid) + { + settings[key] = value; + } + } + fIn.close(); + } +} + +void save_settings(const std::string& path, const map_settings_t& settings) +{ + //TODO: write this +} diff --git a/lib/MiddleWare/Settings.h b/lib/MiddleWare/Settings.h new file mode 100644 index 0000000..a427f1b --- /dev/null +++ b/lib/MiddleWare/Settings.h @@ -0,0 +1,34 @@ +/* + Settings.h - header file for settings functions + + 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 SETTINGSFUNC_H_ +#define SETTINGSFUNC_H_ + +#include "Settings.h" +#include +#include + +typedef std::map map_settings_t; + +void load_settings(const std::string& path, map_settings_t& settings); +void save_settings(const std::string& path, const map_settings_t& settings); + +#endif /* SETTINGSFUNC_H_ */ diff --git a/lib/Utils/Settings.cpp b/lib/Utils/Settings.cpp deleted file mode 100644 index 627bfc6..0000000 --- a/lib/Utils/Settings.cpp +++ /dev/null @@ -1,84 +0,0 @@ -/* - Settings.cpp - header file for settings functions - - 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. - */ - -#include "Settings.h" -#include - - -void load_settings(const std::string& path, map_settings_t& settings) -{ - std::ifstream fIn; - fIn.open(path.c_str()); - if (fIn.is_open()) - { - std::string line; - while (!fIn.eof()) - { - getline(fIn, line); - - int ii; - bool is_value = false; - bool valid = false; - std::string key = ""; - std::string value = ""; - for (ii = 0; ii < line.length(); ii++) - { - if (isspace(line[ii])) - { - continue; - } - if (line[ii] == '#') - { - break; - } - else if (line[ii] == '=') - { - is_value = true; - } - else if (line[ii] == '=' && is_value) - { - key = ""; - value = ""; - break; - } - else if (!is_value) - { - key += line[ii]; - } - else - { - valid = true; - value += line[ii]; - } - } - if (valid) - { - settings[key] = value; - } - } - fIn.close(); - } -} - -void save_settings(const std::string& path, const map_settings_t& settings) -{ - //TODO: write this -} diff --git a/lib/Utils/Settings.h b/lib/Utils/Settings.h deleted file mode 100644 index a427f1b..0000000 --- a/lib/Utils/Settings.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - Settings.h - header file for settings functions - - 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 SETTINGSFUNC_H_ -#define SETTINGSFUNC_H_ - -#include "Settings.h" -#include -#include - -typedef std::map map_settings_t; - -void load_settings(const std::string& path, map_settings_t& settings); -void save_settings(const std::string& path, const map_settings_t& settings); - -#endif /* SETTINGSFUNC_H_ */ -- cgit