From: rmccabe@sourceware.org <rmccabe@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga/ricci common/ClientSocket.cpp common/Exc ...
Date: 18 Sep 2007 21:01:07 -0000 [thread overview]
Message-ID: <20070918210107.18758.qmail@sourceware.org> (raw)
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2007-09-18 21:01:01
Modified files:
ricci/common : ClientSocket.cpp Except.cpp File.cpp Logger.cpp
Module.cpp Network.cpp Random.cpp
ServerSocket.cpp Socket.cpp Thread.cpp Time.cpp
Variable.cpp XML.cpp executils.cpp
executils_test.cpp utils.cpp
ricci/include : APIerror.h Except.h File.h Logger.h Module.h
Mutex.h Network.h Random.h Socket.h String.h
Thread.h Time.h Variable.h XML.h XML_tags.h
array_auto_ptr.h counting_auto_ptr.cpp
counting_auto_ptr.h executils.h
executils_test.h shred_allocator.h signals.h
utils.h
ricci/modules/log: LogParser.cpp LogParser.h LoggingModule.cpp
LoggingModule.h main.cpp
ricci/modules/rpm: PackageHandler.cpp PackageHandler.h
RpmModule.cpp RpmModule.h main.cpp
ricci/modules/service: ServiceManager.cpp ServiceManager.h
ServiceModule.cpp ServiceModule.h
main.cpp
Log message:
More license text and include cleanup
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/common/ClientSocket.cpp.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/common/Except.cpp.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/common/File.cpp.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/common/Logger.cpp.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/common/Module.cpp.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/common/Network.cpp.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/common/Random.cpp.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/common/ServerSocket.cpp.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/common/Socket.cpp.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/common/Thread.cpp.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/common/Time.cpp.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/common/Variable.cpp.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/common/XML.cpp.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/common/executils.cpp.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/common/executils_test.cpp.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/common/utils.cpp.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/include/APIerror.h.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/include/Except.h.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/include/File.h.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/include/Logger.h.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/include/Module.h.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/include/Mutex.h.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/include/Network.h.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/include/Random.h.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/include/Socket.h.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/include/String.h.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/include/Thread.h.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/include/Time.h.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/include/Variable.h.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/include/XML.h.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/include/XML_tags.h.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/include/array_auto_ptr.h.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/include/counting_auto_ptr.cpp.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/include/counting_auto_ptr.h.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/include/executils.h.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/include/executils_test.h.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/include/shred_allocator.h.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/include/signals.h.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/include/utils.h.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/log/LogParser.cpp.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/log/LogParser.h.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/log/LoggingModule.cpp.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/log/LoggingModule.h.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/log/main.cpp.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/PackageHandler.cpp.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/PackageHandler.h.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/RpmModule.cpp.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/RpmModule.h.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/main.cpp.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/service/ServiceManager.cpp.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/service/ServiceManager.h.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/service/ServiceModule.cpp.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/service/ServiceModule.h.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/service/main.cpp.diff?cvsroot=cluster&r1=1.6&r2=1.7
--- conga/ricci/common/ClientSocket.cpp 2007/09/11 00:26:52 1.10
+++ conga/ricci/common/ClientSocket.cpp 2007/09/18 21:01:00 1.11
@@ -1,26 +1,25 @@
/*
- Copyright Red Hat, Inc. 2005-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
#include "Socket.h"
#include "Logger.h"
#include "Network.h"
--- conga/ricci/common/Except.cpp 2007/08/30 22:50:13 1.3
+++ conga/ricci/common/Except.cpp 2007/09/18 21:01:00 1.4
@@ -1,32 +1,29 @@
/*
- Copyright Red Hat, Inc. 2005-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
#include "Except.h"
-
using namespace std;
-
Except::Except(long long error_code, const String& msg) :
_code(error_code), _msg(msg)
{
--- conga/ricci/common/File.cpp 2007/08/30 22:50:13 1.5
+++ conga/ricci/common/File.cpp 2007/09/18 21:01:00 1.6
@@ -1,26 +1,25 @@
/*
- Copyright Red Hat, Inc. 2006-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2006-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
#include "File.h"
#include <fstream>
#include <fcntl.h>
@@ -28,7 +27,6 @@
using namespace std;
-
File_pimpl::File_pimpl(void *fs, bool& owner) :
fs(fs)
{
--- conga/ricci/common/Logger.cpp 2007/09/11 02:45:26 1.6
+++ conga/ricci/common/Logger.cpp 2007/09/18 21:01:00 1.7
@@ -1,26 +1,25 @@
/*
- Copyright Red Hat, Inc. 2005-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
#include "Logger.h"
#include <unistd.h>
@@ -39,7 +38,6 @@
using namespace std;
-
static counting_auto_ptr<Logger> logger(new Logger());
Logger::Logger() :
--- conga/ricci/common/Module.cpp 2007/09/11 00:26:52 1.8
+++ conga/ricci/common/Module.cpp 2007/09/18 21:01:00 1.9
@@ -1,26 +1,25 @@
/*
- Copyright Red Hat, Inc. 2006-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2006-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
#include "Module.h"
#include "Variable.h"
#include "XML_tags.h"
@@ -39,26 +38,20 @@
typedef struct pollfd poll_fd;
#include <iostream>
-using namespace std;
+using namespace std;
static const unsigned int timeout = 3000; // milliseconds
-
static ApiFcnMap _api_fcns; // api->name->function map
static VarMap list_APIs(const VarMap& args);
static VarMap extract_vars(const XMLObject& xml);
static void insert_vars(const VarMap& vars, XMLObject& xml);
-
-
-
// ######## Module ########
-
#define APIs_FUNC_NAME "APIs"
-
Module::Module(const ApiFcnMap& api_fcns)
{
for (ApiFcnMap::const_iterator
--- conga/ricci/common/Network.cpp 2007/08/31 04:57:37 1.2
+++ conga/ricci/common/Network.cpp 2007/09/18 21:01:00 1.3
@@ -1,33 +1,31 @@
/*
- Copyright Red Hat, Inc. 2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
#include "Network.h"
#include <sys/types.h>
#include <sys/socket.h>
#include <arpa/inet.h>
-
counting_auto_ptr<Network::Hostent>
Network::getHostByName(const String& hostname)
{
--- conga/ricci/common/Random.cpp 2007/08/31 04:57:37 1.3
+++ conga/ricci/common/Random.cpp 2007/09/18 21:01:00 1.4
@@ -1,26 +1,25 @@
/*
- Copyright Red Hat, Inc. 2005-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
#include "Random.h"
#include "Mutex.h"
#include "Time.h"
--- conga/ricci/common/ServerSocket.cpp 2007/08/31 04:57:37 1.5
+++ conga/ricci/common/ServerSocket.cpp 2007/09/18 21:01:00 1.6
@@ -1,26 +1,25 @@
/*
- Copyright Red Hat, Inc. 2005-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
#include "Socket.h"
#include "Logger.h"
@@ -32,7 +31,6 @@
#include <netinet/in.h>
#include "String.h"
-
ServerSocket::ServerSocket(const String& sock_path) :
Socket(-1),
_unix_sock(true),
--- conga/ricci/common/Socket.cpp 2007/08/30 22:50:13 1.8
+++ conga/ricci/common/Socket.cpp 2007/09/18 21:01:00 1.9
@@ -1,26 +1,25 @@
/*
- Copyright Red Hat, Inc. 2005-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
#include "Socket.h"
#include "Logger.h"
#include "Time.h"
--- conga/ricci/common/Thread.cpp 2007/09/07 19:08:09 1.4
+++ conga/ricci/common/Thread.cpp 2007/09/18 21:01:00 1.5
@@ -1,26 +1,25 @@
/*
- Copyright Red Hat, Inc. 2005-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
#include "Thread.h"
//#include "Logger.h"
#include "String.h"
--- conga/ricci/common/Time.cpp 2007/08/31 04:57:37 1.6
+++ conga/ricci/common/Time.cpp 2007/09/18 21:01:00 1.7
@@ -1,32 +1,30 @@
/*
- Copyright Red Hat, Inc. 2005-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
#include "Time.h"
#include <errno.h>
#include <sys/time.h>
-
unsigned int
time_sec()
{
--- conga/ricci/common/Variable.cpp 2007/08/31 04:57:37 1.9
+++ conga/ricci/common/Variable.cpp 2007/09/18 21:01:00 1.10
@@ -1,36 +1,33 @@
/*
- Copyright Red Hat, Inc. 2005-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
#include "Variable.h"
#include "XML_tags.h"
#include "utils.h"
#include <stdio.h>
-
using namespace std;
-
// ##### class Variable #####
Variable::Variable(const XMLObject& xml)
--- conga/ricci/common/XML.cpp 2007/09/05 22:27:29 1.12
+++ conga/ricci/common/XML.cpp 2007/09/18 21:01:00 1.13
@@ -1,26 +1,25 @@
/*
- Copyright Red Hat, Inc. 2005-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
#include "XML.h"
#include "Mutex.h"
#include "utils.h"
@@ -34,8 +33,6 @@
//#include <iostream>
using namespace std;
-
-
static String escape_chars(const String&);
static String invert_chars(const String&);
--- conga/ricci/common/executils.cpp 2007/08/30 22:50:13 1.10
+++ conga/ricci/common/executils.cpp 2007/09/18 21:01:00 1.11
@@ -1,26 +1,25 @@
/*
- Copyright Red Hat, Inc. 2005-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
#include "executils.h"
#include "Logger.h"
#include "Time.h"
@@ -34,8 +33,6 @@
#include <errno.h>
#include <fcntl.h>
-
-
static void read_data(struct pollfd& poll_info, bool& fd_closed, String& data);
static void close_fd(int fd);
--- conga/ricci/common/executils_test.cpp 2007/09/11 02:45:26 1.3
+++ conga/ricci/common/executils_test.cpp 2007/09/18 21:01:00 1.4
@@ -1,5 +1,20 @@
-
-
+/*
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
+*/
#include "executils.h"
#include "executils_test.h"
@@ -8,7 +23,6 @@
#include "Logger.h"
#include "counting_auto_ptr.h"
-
extern "C" {
#include "signals.h"
#include <signal.h>
@@ -23,60 +37,56 @@
#include <sys/types.h>
#include <unistd.h>
-
using namespace std;
using namespace ClusterMonitoring;
-
static void nothing(int);
static void nothing_2(int);
-
Mutex mutex;
bool running = true;
pid_t pid;
-
int
-main(int argc, char** argv)
+main(int argc, char **argv)
{
- // set_logger(counting_auto_ptr<Logger>(new Logger(1, "executils_test", LogExecute)));
+ //set_logger(counting_auto_ptr<Logger>(new Logger(1, "executils_test", LogExecute)));
- map<String, vector<String> > oracle;
- oracle["/bin/cat"] = vector<String>(1, "/etc/cluster/cluster.conf");
- oracle["/sbin/magma_tool"] = vector<String>(1, "members");
- oracle["/usr/sbin/clustat"] = vector<String>(1, "-x");
- oracle["/sbin/ifconfig"] = vector<String>();
- // oracle["/bin/sleep"] = vector<String>(1, "4");
-
- setup_signal(SIGUSR1, nothing);
- setup_signal(SIGUSR2, nothing_2);
-
- pid = getpid();
-
- Killer killer;
- killer.start();
-
- while (true) {
- for (map<String, vector<String> >::iterator iter = oracle.begin();
- iter != oracle.end();
- iter++) {
- String out, err;
- int status;
-
- execute(iter->first, iter->second, out, err, status);
-
- // cout << iter->first << ":" << endl;
- // cout << out << endl << endl << err << endl << endl;
-
- MutexLocker l(mutex);
- running = true;
- }
- // poll(NULL, 0, 10);
- }
+ map<String, vector<String> > oracle;
+ oracle["/bin/cat"] = vector<String>(1, "/etc/cluster/cluster.conf");
+ oracle["/sbin/magma_tool"] = vector<String>(1, "members");
+ oracle["/usr/sbin/clustat"] = vector<String>(1, "-x");
+ oracle["/sbin/ifconfig"] = vector<String>();
+ //oracle["/bin/sleep"] = vector<String>(1, "4");
+
+ setup_signal(SIGUSR1, nothing);
+ setup_signal(SIGUSR2, nothing_2);
+
+ pid = getpid();
+
+ Killer killer;
+ killer.start();
+
+ while (true) {
+ for (map<String, vector<String> >::iterator
+ iter = oracle.begin() ;
+ iter != oracle.end() ;
+ iter++)
+ {
+ String out, err;
+ int status;
+
+ execute(iter->first, iter->second, out, err, status);
+
+ //cout << iter->first << ":" << endl;
+ //cout << out << endl << endl << err << endl << endl;
+ MutexLocker l(mutex);
+ running = true;
+ }
+ //poll(NULL, 0, 10);
+ }
}
-
void
nothing(int)
{}
@@ -84,31 +94,30 @@
void
nothing_2(int)
{
- poll(NULL, 0, rand() % 20);
+ poll(NULL, 0, rand() % 20);
}
-
void
Killer::run()
{
- int time_to_check = time_sec() + 10;
+ int time_to_check = time_sec() + 10;
- srand(time_sec());
- while (!shouldStop()) {
- kill(pid, SIGUSR2);
- poll(NULL, 0, rand() % 117 + 20);
-
- kill(pid, SIGUSR1);
- poll(NULL, 0, rand() % 43 + 20);
-
- MutexLocker l(mutex);
- if (time_sec() > time_to_check) {
- if (!::running) {
- cout << "hosed :)" << endl;
- return;
- }
- ::running = false;
- time_to_check = time_sec() + 10;
- }
- }
+ srand(time_sec());
+ while (!shouldStop()) {
+ kill(pid, SIGUSR2);
+ poll(NULL, 0, rand() % 117 + 20);
+
+ kill(pid, SIGUSR1);
+ poll(NULL, 0, rand() % 43 + 20);
+
+ MutexLocker l(mutex);
+ if (time_sec() > time_to_check) {
+ if (!::running) {
+ cout << "hosed :)" << endl;
+ return;
+ }
+ ::running = false;
+ time_to_check = time_sec() + 10;
+ }
+ }
}
--- conga/ricci/common/utils.cpp 2007/08/31 04:57:37 1.10
+++ conga/ricci/common/utils.cpp 2007/09/18 21:01:00 1.11
@@ -1,26 +1,25 @@
/*
- Copyright Red Hat, Inc. 2005-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
#include "utils.h"
#include "executils.h"
@@ -29,10 +28,8 @@
//#include <iostream>
-
using namespace std;
-
String
utils::replace(const String& what, const String& with, const String& in_str)
{
--- conga/ricci/include/APIerror.h 2007/08/31 13:32:36 1.3
+++ conga/ricci/include/APIerror.h 2007/09/18 21:01:00 1.4
@@ -1,28 +1,27 @@
/*
- Copyright Red Hat, Inc. 2006-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2006-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
-#ifndef __CONGA_APIerror_h
-#define __CONGA_APIerror_h
+#ifndef __CONGA_APIERROR_H
+#define __CONGA_APIERROR_H
class APIerror
{
--- conga/ricci/include/Except.h 2007/08/31 13:32:36 1.4
+++ conga/ricci/include/Except.h 2007/09/18 21:01:00 1.5
@@ -1,28 +1,27 @@
/*
- Copyright Red Hat, Inc. 2005-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
-#ifndef __CONGA_Except_h
-#define __CONGA_Except_h
+#ifndef __CONGA_EXCEPT_H
+#define __CONGA_EXCEPT_H
#include "String.h"
@@ -44,4 +43,4 @@
String _msg;
};
-#endif // Except_h
+#endif
--- conga/ricci/include/File.h 2007/08/31 13:32:36 1.2
+++ conga/ricci/include/File.h 2007/09/18 21:01:00 1.3
@@ -1,33 +1,31 @@
/*
- Copyright Red Hat, Inc. 2006-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2006-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
-#ifndef __CONGA_File_h
-#define __CONGA_File_h
+#ifndef __CONGA_FILE_H
+#define __CONGA_FILE_H
#include "String.h"
#include "counting_auto_ptr.h"
-
class File_pimpl
{
public:
--- conga/ricci/include/Logger.h 2007/09/11 00:26:52 1.4
+++ conga/ricci/include/Logger.h 2007/09/18 21:01:00 1.5
@@ -1,28 +1,27 @@
/*
- Copyright Red Hat, Inc. 2005-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
-#ifndef __CONGA_Logger_h
-#define __CONGA_Logger_h
+#ifndef __CONGA_LOGGER_H
+#define __CONGA_LOGGER_H
#include "counting_auto_ptr.h"
#include "String.h"
--- conga/ricci/include/Module.h 2007/08/31 13:32:36 1.4
+++ conga/ricci/include/Module.h 2007/09/18 21:01:00 1.5
@@ -1,28 +1,27 @@
/*
- Copyright Red Hat, Inc. 2006-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2006-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
-#ifndef __CONGA_Module_h
-#define __CONGA_Module_h
+#ifndef __CONGA_MODULE_H
+#define __CONGA_MODULE_H
#include "XML.h"
#include "Variable.h"
@@ -49,7 +48,6 @@
protected:
Module(const ApiFcnMap& api_fcns);
-
};
int stdin_out_module_driver(Module& module, int argc, char **argv);
--- conga/ricci/include/Mutex.h 2007/08/31 13:32:36 1.2
+++ conga/ricci/include/Mutex.h 2007/09/18 21:01:00 1.3
@@ -1,32 +1,30 @@
/*
- Copyright Red Hat, Inc. 2005-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
-#ifndef __CONGA_Mutex_h
-#define __CONGA_Mutex_h
+#ifndef __CONGA_MUTEX_H
+#define __CONGA_MUTEX_H
#include <pthread.h>
-
class Mutex
{
public:
--- conga/ricci/include/Network.h 2007/08/31 13:32:36 1.2
+++ conga/ricci/include/Network.h 2007/09/18 21:01:00 1.3
@@ -1,28 +1,27 @@
/*
- Copyright Red Hat, Inc. 2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
-#ifndef Conga_Network_h
-#define Conga_Network_h
+#ifndef __CONGA_NETWORK_H
+#define __CONGA_NETWORK_H
#include "counting_auto_ptr.h"
#include "String.h"
--- conga/ricci/include/Random.h 2007/08/31 13:32:36 1.2
+++ conga/ricci/include/Random.h 2007/09/18 21:01:00 1.3
@@ -1,28 +1,27 @@
/*
- Copyright Red Hat, Inc. 2005-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
-#ifndef __CONGA_Random_h
-#define __CONGA_Random_h
+#ifndef __CONGA_RANDOM_H
+#define __CONGA_RANDOM_H
int random_generator(int min, int max);
--- conga/ricci/include/Socket.h 2007/08/31 13:32:36 1.6
+++ conga/ricci/include/Socket.h 2007/09/18 21:01:00 1.7
@@ -1,26 +1,25 @@
/*
- Copyright Red Hat, Inc. 2005-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
#ifndef __CONGA_SOCKET_H
#define __CONGA_SOCKET_H
@@ -29,7 +28,6 @@
#include "String.h"
#include <vector>
-
// NOT THREAD SAFE
// provide external locking
@@ -61,14 +59,16 @@
void decrease_counter();
};
-
class ServerSocket;
class ClientSocket : public Socket
{
public:
ClientSocket();
- ClientSocket(const String& sock_path); // UNIX socket
+
+ // UNIX domain socket
+ ClientSocket(const String& sock_path);
+
ClientSocket( const String& hostname,
unsigned short port,
unsigned int timeout_ms=0);
@@ -78,7 +78,10 @@
virtual String recv();
virtual String recv(int timeout);
- virtual String send(const String& msg); // return what is left to send
+
+ // return what is left to send
+ virtual String send(const String& msg);
+
virtual String send(const String& msg, int timeout);
virtual void ready(bool& recv, bool& send, int timeout);
@@ -86,9 +89,11 @@
virtual bool connected_to(const String& hostname);
protected:
- u_int32_t _addr; // address in network byte order
+ // address in network byte order
+ u_int32_t _addr;
- ClientSocket(int sock, u_int32_t addr=0); // takes ownership of sock
+ // takes ownership of sock
+ ClientSocket(int sock, u_int32_t addr=0);
friend class ServerSocket;
};
--- conga/ricci/include/String.h 2007/09/07 19:49:29 1.4
+++ conga/ricci/include/String.h 2007/09/18 21:01:00 1.5
@@ -1,3 +1,21 @@
+/*
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
+*/
+
#ifndef __CONGA_STRING_H
#define __CONGA_STRING_H
--- conga/ricci/include/Thread.h 2007/08/31 13:32:36 1.2
+++ conga/ricci/include/Thread.h 2007/09/18 21:01:00 1.3
@@ -1,27 +1,27 @@
/*
- Copyright Red Hat, Inc. 2005-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-#ifndef __CONGA_Thread_h
-#define __CONGA_Thread_h
+#ifndef __CONGA_THREAD_H
+#define __CONGA_THREAD_H
#include <pthread.h>
#include "Mutex.h"
@@ -40,7 +40,9 @@
protected:
// kids, return from run() if true, check it often
virtual bool shouldStop();
- virtual void run() = 0; // run in new thread
+
+ // run in new thread
+ virtual void run() = 0;
private:
bool _stop;
@@ -52,7 +54,7 @@
Thread(const Thread&);
Thread& operator= (const Thread&);
- friend void* start_thread(void*);
+ friend void *start_thread(void *);
};
#endif
--- conga/ricci/include/Time.h 2007/08/31 13:32:36 1.5
+++ conga/ricci/include/Time.h 2007/09/18 21:01:00 1.6
@@ -1,26 +1,25 @@
/*
- Copyright Red Hat, Inc. 2005-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
#ifndef __CONGA_TIME_H
#define __CONGA_TIME_H
--- conga/ricci/include/Variable.h 2007/08/31 13:32:36 1.5
+++ conga/ricci/include/Variable.h 2007/09/18 21:01:00 1.6
@@ -1,21 +1,21 @@
/*
- Copyright Red Hat, Inc. 2005-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
@@ -200,7 +200,6 @@
String _cond_bool_ifnot;
Validator _validator;
-
};
#endif
--- conga/ricci/include/XML.h 2007/08/31 13:32:36 1.5
+++ conga/ricci/include/XML.h 2007/09/18 21:01:00 1.6
@@ -1,26 +1,25 @@
/*
- Copyright Red Hat, Inc. 2005-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
#ifndef __CONGA_XML_H
#define __CONGA_XML_H
@@ -28,7 +27,6 @@
#include <map>
#include <list>
-
class XMLObject
{
public:
--- conga/ricci/include/XML_tags.h 2007/08/31 13:32:36 1.5
+++ conga/ricci/include/XML_tags.h 2007/09/18 21:01:00 1.6
@@ -1,26 +1,25 @@
/*
- Copyright Red Hat, Inc. 2005-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
#ifndef __CONGA_XML_TAGS_H
#define __CONGA_XML_TAGS_H
--- conga/ricci/include/array_auto_ptr.h 2007/08/31 13:32:36 1.2
+++ conga/ricci/include/array_auto_ptr.h 2007/09/18 21:01:00 1.3
@@ -1,28 +1,27 @@
/*
- Copyright Red Hat, Inc. 2005-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
-#ifndef array_auto_ptr_h
-#define array_auto_ptr_h
+#ifndef __CONGA_ARRAY_AUTO_PTR_H
+#define __CONGA_ARRAY_AUTO_PTR_H
template <class T>
class array_auto_ptr
--- conga/ricci/include/counting_auto_ptr.cpp 2007/09/07 19:07:22 1.6
+++ conga/ricci/include/counting_auto_ptr.cpp 2007/09/18 21:01:00 1.7
@@ -1,31 +1,29 @@
/*
- Copyright Red Hat, Inc. 2005-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
#include "counting_auto_ptr.h"
-
template<class X>
-counting_auto_ptr<X>::counting_auto_ptr(X* ptr) :
+counting_auto_ptr<X>::counting_auto_ptr(X *ptr) :
_ptr(ptr)
{
try {
--- conga/ricci/include/counting_auto_ptr.h 2007/09/04 21:28:05 1.4
+++ conga/ricci/include/counting_auto_ptr.h 2007/09/18 21:01:00 1.5
@@ -1,28 +1,27 @@
/*
- Copyright Red Hat, Inc. 2005-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
-#ifndef counting_auto_ptr_h
-#define counting_auto_ptr_h
+#ifndef __CONGA_COUNTING_AUTO_PTR_H
+#define __CONGA_COUNTING_AUTO_PTR_H
#include "Mutex.h"
@@ -30,23 +29,23 @@
class counting_auto_ptr
{
public:
- explicit counting_auto_ptr(X* ptr = 0);
+ explicit counting_auto_ptr(X *ptr = 0);
counting_auto_ptr(const counting_auto_ptr<X>&);
counting_auto_ptr<X>& operator= (const counting_auto_ptr<X>&);
virtual ~counting_auto_ptr();
X& operator*() const;
- X* operator->() const;
+ X *operator->() const;
bool operator== (const counting_auto_ptr<X>& a) const {
return _ptr == a._ptr;
}
- X* get() const;
+ X *get() const;
private:
- X* _ptr;
- Mutex* _mutex;
+ X *_ptr;
+ Mutex *_mutex;
int *_counter;
void decrease_counter();
};
--- conga/ricci/include/executils.h 2007/08/31 13:32:36 1.4
+++ conga/ricci/include/executils.h 2007/09/18 21:01:00 1.5
@@ -1,33 +1,31 @@
/*
- Copyright Red Hat, Inc. 2005-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
-#ifndef __CONGA_executils_h
-#define __CONGA_executils_h
+#ifndef __CONGA_EXECUTILS_H
+#define __CONGA_EXECUTILS_H
#include "String.h"
#include <vector>
-
/*
** return 0 on success, non-zero on failure
** Kill the child process after @timeout ms has elapsed,
@@ -40,4 +38,4 @@
int& status,
int timeout=-1);
-#endif // executils_h
+#endif
--- conga/ricci/include/executils_test.h 2007/08/31 13:32:36 1.2
+++ conga/ricci/include/executils_test.h 2007/09/18 21:01:00 1.3
@@ -1,20 +1,32 @@
+/*
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
+*/
-
-#ifndef executils_test_h
-#define executils_test_h
+#ifndef EXECUTILS_TEST_H
+#define EXECUTILS_TEST_H
#include "Thread.h"
-
class Killer : public ClusterMonitoring::Thread
{
- public:
-
- protected:
- virtual void run();
+ public:
+ protected:
+ virtual void run();
};
-
-
-#endif // executils_test_h
+#endif
--- conga/ricci/include/shred_allocator.h 2007/09/04 18:43:26 1.4
+++ conga/ricci/include/shred_allocator.h 2007/09/18 21:01:00 1.5
@@ -30,8 +30,8 @@
// invalidate any other reasons why the executable file might be covered by
// the GNU General Public License.
-#ifndef shred_allocator_h
-#define shred_allocator_h 1
+#ifndef __CONGA_SHRED_ALLOCATOR_H
+#define __CONGA_SHRED_ALLOCATOR_H
#include <new>
@@ -119,4 +119,4 @@
{ return false; }
-#endif // shred_allocator_h
+#endif
--- conga/ricci/include/signals.h 2006/03/06 21:48:04 1.1
+++ conga/ricci/include/signals.h 2007/09/18 21:01:00 1.2
@@ -1,7 +1,25 @@
+/*
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
+*/
+
#ifndef __SIGNALS_H
#define __SIGNALS_H
-void* setup_signal(int, void (*)(int));
+void *setup_signal(int, void (*)(int));
int block_signal(int sig);
int unblock_signal(int sig);
int block_all_signals(void);
--- conga/ricci/include/utils.h 2007/08/31 13:32:36 1.7
+++ conga/ricci/include/utils.h 2007/09/18 21:01:00 1.8
@@ -1,33 +1,36 @@
/*
- Copyright Red Hat, Inc. 2005-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
-#ifndef __CONGA_utils_h
-#define __CONGA_utils_h
+#ifndef __CONGA_UTILS_H
+#define __CONGA_UTILS_H
#include <vector>
#include "String.h"
#include <map>
+#ifndef arr_elem
+# define arr_elem(x) (sizeof((x)) / sizeof((x)[0]))
+#endif
+
class exec_cache
{
public:
@@ -49,7 +52,6 @@
const int exec_ret;
};
-
class utils
{
public:
@@ -94,7 +96,6 @@
String& err,
int& status,
bool caching=true);
-
static void clear_cache();
static std::map<String, exec_cache> cache;
};
--- conga/ricci/modules/log/LogParser.cpp 2007/09/18 18:46:35 1.11
+++ conga/ricci/modules/log/LogParser.cpp 2007/09/18 21:01:00 1.12
@@ -1,5 +1,5 @@
/*
-** Copyright Red Hat, Inc. 2006-2007
+** Copyright (C) Red Hat, Inc. 2006-2007
**
** This program is free software; you can redistribute it and/or modify it
** under the terms of the GNU General Public License version 2 as
--- conga/ricci/modules/log/LogParser.h 2007/09/18 18:46:35 1.5
+++ conga/ricci/modules/log/LogParser.h 2007/09/18 21:01:00 1.6
@@ -1,5 +1,5 @@
/*
-** Copyright Red Hat, Inc. 2006-2007
+** Copyright (C) Red Hat, Inc. 2006-2007
**
** This program is free software; you can redistribute it and/or modify it
** under the terms of the GNU General Public License version 2 as
--- conga/ricci/modules/log/LoggingModule.cpp 2007/09/18 18:46:35 1.5
+++ conga/ricci/modules/log/LoggingModule.cpp 2007/09/18 21:01:00 1.6
@@ -1,5 +1,5 @@
/*
-** Copyright Red Hat, Inc. 2006-2007
+** Copyright (C) Red Hat, Inc. 2006-2007
**
** This program is free software; you can redistribute it and/or modify it
** under the terms of the GNU General Public License version 2 as
--- conga/ricci/modules/log/LoggingModule.h 2007/09/18 18:46:35 1.3
+++ conga/ricci/modules/log/LoggingModule.h 2007/09/18 21:01:00 1.4
@@ -1,5 +1,5 @@
/*
-** Copyright Red Hat, Inc. 2006-2007
+** Copyright (C) Red Hat, Inc. 2006-2007
**
** This program is free software; you can redistribute it and/or modify it
** under the terms of the GNU General Public License version 2 as
--- conga/ricci/modules/log/main.cpp 2007/09/18 18:46:35 1.5
+++ conga/ricci/modules/log/main.cpp 2007/09/18 21:01:00 1.6
@@ -1,5 +1,5 @@
/*
-** Copyright Red Hat, Inc. 2006-2007
+** Copyright (C) Red Hat, Inc. 2006-2007
**
** This program is free software; you can redistribute it and/or modify it
** under the terms of the GNU General Public License version 2 as
--- conga/ricci/modules/rpm/PackageHandler.cpp 2007/09/18 20:30:58 1.17
+++ conga/ricci/modules/rpm/PackageHandler.cpp 2007/09/18 21:01:01 1.18
@@ -1,26 +1,25 @@
/*
- Copyright Red Hat, Inc. 2006-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2006-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
#include "PackageHandler.h"
#include "utils.h"
#include "File.h"
--- conga/ricci/modules/rpm/PackageHandler.h 2007/09/11 18:59:42 1.7
+++ conga/ricci/modules/rpm/PackageHandler.h 2007/09/18 21:01:01 1.8
@@ -1,26 +1,25 @@
/*
- Copyright Red Hat, Inc. 2006-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2006-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
#ifndef __CONGA_MODRPM_PACKAGEHANDLER_H
#define __CONGA_MODRPM_PACKAGEHANDLER_H
--- conga/ricci/modules/rpm/RpmModule.cpp 2007/09/18 20:30:58 1.6
+++ conga/ricci/modules/rpm/RpmModule.cpp 2007/09/18 21:01:01 1.7
@@ -1,26 +1,25 @@
/*
- Copyright Red Hat, Inc. 2006-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2006-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
#include "RpmModule.h"
#include "PackageHandler.h"
--- conga/ricci/modules/rpm/RpmModule.h 2007/09/11 18:59:42 1.3
+++ conga/ricci/modules/rpm/RpmModule.h 2007/09/18 21:01:01 1.4
@@ -1,21 +1,21 @@
/*
- Copyright Red Hat, Inc. 2006-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2006-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
--- conga/ricci/modules/rpm/main.cpp 2007/09/11 18:59:42 1.6
+++ conga/ricci/modules/rpm/main.cpp 2007/09/18 21:01:01 1.7
@@ -1,26 +1,25 @@
/*
- Copyright Red Hat, Inc. 2005-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
#include "RpmModule.h"
#include <iostream>
--- conga/ricci/modules/service/ServiceManager.cpp 2007/09/11 13:53:19 1.13
+++ conga/ricci/modules/service/ServiceManager.cpp 2007/09/18 21:01:01 1.14
@@ -1,26 +1,25 @@
/*
- Copyright Red Hat, Inc. 2006-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2006-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
#include "ServiceManager.h"
#include "utils.h"
#include "File.h"
@@ -538,7 +537,7 @@
if (populate_set(s, servs))
sets[name] = s;
- return sets;
+ return sets;
}
bool
--- conga/ricci/modules/service/ServiceManager.h 2007/09/11 13:53:19 1.6
+++ conga/ricci/modules/service/ServiceManager.h 2007/09/18 21:01:01 1.7
@@ -1,28 +1,27 @@
/*
- Copyright Red Hat, Inc. 2006-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2006-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
-#ifndef ServiceManager_h
-#define ServiceManager_h
+#ifndef __CONGA_MODSERVICE_SERVICEMANAGER_H
+#define __CONGA_MODSERVICE_SERVICEMANAGER_H
#include "XML.h"
#include "counting_auto_ptr.h"
--- conga/ricci/modules/service/ServiceModule.cpp 2007/09/11 13:53:19 1.6
+++ conga/ricci/modules/service/ServiceModule.cpp 2007/09/18 21:01:01 1.7
@@ -1,30 +1,28 @@
/*
- Copyright Red Hat, Inc. 2006-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2006-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
#include "ServiceModule.h"
#include "ServiceManager.h"
-
using namespace std;
static VarMap enable(const VarMap& args);
--- conga/ricci/modules/service/ServiceModule.h 2007/09/11 13:53:19 1.3
+++ conga/ricci/modules/service/ServiceModule.h 2007/09/18 21:01:01 1.4
@@ -1,41 +1,37 @@
/*
- Copyright Red Hat, Inc. 2006-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2006-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
-
-#ifndef ServiceModule_h
-#define ServiceModule_h
+#ifndef __CONGA_MODSERVICE_SERVICEMODULE_H
+#define __CONGA_MODSERVICE_SERVICEMODULE_H
#include "Module.h"
-
class ServiceModule : public Module
{
- public:
- ServiceModule();
- virtual ~ServiceModule();
-
- private:
+ public:
+ ServiceModule();
+ virtual ~ServiceModule();
+ private:
};
-
-#endif // ServiceModule_h
+#endif
--- conga/ricci/modules/service/main.cpp 2007/09/11 13:53:19 1.6
+++ conga/ricci/modules/service/main.cpp 2007/09/18 21:01:01 1.7
@@ -1,21 +1,21 @@
/*
- Copyright Red Hat, Inc. 2005-2007
-
- 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, 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; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
- MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
*/
+
/*
* Author: Stanko Kupcevic <kupcevic@redhat.com>
*/
next reply other threads:[~2007-09-18 21:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-18 21:01 rmccabe [this message]
-- strict thread matches above, loose matches on Subject: below --
2006-08-10 22:53 [Cluster-devel] conga/ricci common/ClientSocket.cpp common/Exc kupcevic
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070918210107.18758.qmail@sourceware.org \
--to=rmccabe@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.