From mboxrd@z Thu Jan  1 00:00:00 1970
From: kupcevic@sourceware.org <kupcevic@sourceware.org>
Date: 19 Jun 2006 21:21:56 -0000
Subject: [Cluster-devel] conga ./conga.spec.in.in make/version.in ricci ...
Message-ID: <20060619212156.27229.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-06-19 21:21:54

Modified files:
	.              : conga.spec.in.in 
	make           : version.in 
	ricci/modules/cluster/clumon/src/daemon: Communicator.cpp 
	                                         Communicator.h 
	ricci/modules/cluster/clumon/src/snmp-agent: clusterMIB.cpp 
	ricci/ricci    : QueueLocker.cpp Ricci.cpp 

Log message:
	Clean compiler warnings on x86_64, ppc64, s390

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/daemon/Communicator.cpp.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/daemon/Communicator.h.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/snmp-agent/clusterMIB.cpp.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/QueueLocker.cpp.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/Ricci.cpp.diff?cvsroot=cluster&r1=1.8&r2=1.9

--- conga/conga.spec.in.in	2006/06/16 23:14:33	1.7
+++ conga/conga.spec.in.in	2006/06/19 21:21:54	1.8
@@ -48,7 +48,7 @@
 %setup -q
 
 %build
-./autogen.sh
+#./autogen.sh
 #./configure --arch=%{_arch} --sbindir=%{_sbindir} --libdir=%{_libdir} --docdir=%{_docdir}
 %configure --arch=%{_arch} --docdir=%{_docdir} --pegasus_providers_dir=%{PEGASUS_PROVIDERS_DIR}
 make
--- conga/make/version.in	2006/06/16 21:34:25	1.5
+++ conga/make/version.in	2006/06/19 21:21:54	1.6
@@ -1,2 +1,2 @@
 VERSION=0.8
-RELEASE=4.FC5
+RELEASE=5.FC6
--- conga/ricci/modules/cluster/clumon/src/daemon/Communicator.cpp	2006/03/27 23:15:30	1.1
+++ conga/ricci/modules/cluster/clumon/src/daemon/Communicator.cpp	2006/06/19 21:21:54	1.2
@@ -41,6 +41,14 @@
 
 
 
+CommDP::CommDP()
+{}
+
+CommDP::~CommDP()
+{}
+
+
+
 Communicator::Communicator(unsigned short port, 
 			   CommDP& delivery_point) :
   _port(port), 
--- conga/ricci/modules/cluster/clumon/src/daemon/Communicator.h	2006/03/27 23:15:30	1.1
+++ conga/ricci/modules/cluster/clumon/src/daemon/Communicator.h	2006/06/19 21:21:54	1.2
@@ -41,6 +41,9 @@
 class CommDP
 {
  public:
+  CommDP();
+  virtual ~CommDP();
+  
   virtual void msg_arrived(const std::string& host,
 			   const std::string& msg) = 0;
 };
--- conga/ricci/modules/cluster/clumon/src/snmp-agent/clusterMIB.cpp	2006/06/14 21:44:37	1.1
+++ conga/ricci/modules/cluster/clumon/src/snmp-agent/clusterMIB.cpp	2006/06/19 21:21:54	1.2
@@ -33,7 +33,7 @@
 using namespace std;
 
 
-static unsigned int getStatusCode();
+static unsigned int getStatusCode(Cluster*);
 static string getStatusDescription(unsigned int code);
 
 
--- conga/ricci/ricci/QueueLocker.cpp	2006/03/23 16:29:37	1.1
+++ conga/ricci/ricci/QueueLocker.cpp	2006/06/19 21:21:54	1.2
@@ -54,9 +54,9 @@
     
     // acquire flock
     int res;
-    while (res = flock(fd, LOCK_EX))
+    while ((res = flock(fd, LOCK_EX)))
       if (errno != EINTR) {
-	while (res = close(fd))
+	while ((res = close(fd)))
 	  if (errno != EINTR)
 	    throw string("unable to close the queue lock file");
 	throw string("unable to lock the queue");
@@ -72,9 +72,9 @@
   if (!--q_counter) {
     // release flock
     int res;
-    while (res = close(fd))
+    while ((res = close(fd)))
       if (errno != EINTR) {
-	while (res = flock(fd, LOCK_UN))
+	while ((res = flock(fd, LOCK_UN)))
 	  if (errno != EINTR)
 	    break; // throw string("unable to unlock the queue");
 	break; // throw string("unable to close the queue lock file");
--- conga/ricci/ricci/Ricci.cpp	2006/06/09 16:32:19	1.8
+++ conga/ricci/ricci/Ricci.cpp	2006/06/19 21:21:54	1.9
@@ -295,7 +295,7 @@
 		     S_IRUSR|S_IWUSR|S_IRGRP);
   if (fd == -1)
     throw string("unable to create batch file");
-  while (res = close(fd))
+  while ((res = close(fd)))
     if (errno != EINTR)
       throw string("unable to close batch fd");
   
@@ -427,7 +427,7 @@
   if (!dir)
     throw string("unable to open queue directory");
   struct dirent* file_entry;
-  while (file_entry = readdir(dir))
+  while ((file_entry = readdir(dir)))
     try {
       string name(file_entry->d_name);
       // check name