Fix compilation warnings with gcc 4.1.2 (CentOS 5.4). Patch by Charles Loomis

include/History.h

@@ -217,4 +217,5 @@ private:
     static int dump(ostringstream& oss, int  num, char **names, char **values);
 };
 
-#endif /*HISTORY_H_*/
+#endif /*HISTORY_H_*/
+

include/MySqlDB.h

@@ -126,4 +126,5 @@ public:
 };
 #endif
 
-#endif /*MYSQL_DB_H_*/
+#endif /*MYSQL_DB_H_*/
+

include/ObjectSQL.h

@@ -68,4 +68,5 @@ protected:
         SqlDB * db) = 0;
 };
 
-#endif /*OBJECT_SQL_H_*/
+#endif /*OBJECT_SQL_H_*/
+

include/RangedLeases.h

@@ -106,4 +106,5 @@ private:
 
 };
 
-#endif /*RANGED_LEASES_H_*/
+#endif /*RANGED_LEASES_H_*/
+

include/RequestManager.h

@@ -282,7 +282,7 @@ private:
                 break;
         }
                 
-        if ( rc != (int)NULL )
+        if ( rc != 0 )
         {
             oss << " Returned error code [" << rc << "].";       
         }

include/UserPool.h

@@ -186,4 +186,5 @@ private:
     int init_cb(void *nil, int num, char **values, char **names);
 };
 
-#endif /*USER_POOL_H_*/
+#endif /*USER_POOL_H_*/
+

include/VirtualNetwork.h

@@ -51,7 +51,7 @@ public:
     {
         UNINITIALIZED   = -1,
         RANGED          =  0,
-        FIXED           =  1,
+        FIXED           =  1
     };
 
     // *************************************************************************

src/authm/AuthManager.cc

@@ -181,7 +181,7 @@ void AuthRequest::add_auth(Object        ob,
     self_authorize = self_authorize && auth;
 
     auths.push_back(oss.str());
-};
+}
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
@@ -228,7 +228,7 @@ int AuthManager::start()
     rc = pthread_create(&authm_thread,&pattr,authm_action_loop,(void *) this);
 
     return rc;
-};
+}
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */

src/common/Attribute.cc

@@ -180,4 +180,5 @@ string VectorAttribute::vector_value(const char *name) const
     {
         return it->second;
     }
-};
+}
+

src/dm/DispatchManager.cc

@@ -55,7 +55,7 @@ int DispatchManager::start()
     rc = pthread_create(&dm_thread,&pattr,dm_action_loop,(void *) this);
 
     return rc;
-};
+}
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */

src/hm/HookManager.cc

@@ -102,7 +102,7 @@ int HookManager::start()
     rc = pthread_create(&hm_thread,&pattr,hm_action_loop,(void *) this);
 
     return rc;
-};
+}
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */

src/hm/HookManagerDriver.cc

@@ -42,7 +42,7 @@ void HookManagerDriver::execute(
     }
 
     write(oss);
-};
+}
 
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
@@ -69,7 +69,7 @@ void HookManagerDriver::execute(
     }
 
     write(oss);
-};
+}
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */

src/host/Host.cc

@@ -42,10 +42,10 @@ Host::Host(
         last_monitored(0),
         cluster(ClusterPool::DEFAULT_CLUSTER_NAME),
         host_template(id)
-        {};
+        {}
 
 
-Host::~Host(){};
+Host::~Host(){}
 
 /* ************************************************************************ */
 /* Host :: Database Access Functions                                        */
@@ -423,7 +423,7 @@ ostream& operator<<(ostream& os, Host& host)
     os << host.to_xml(host_str);
 
     return os;
-};
+}
 
 /* ------------------------------------------------------------------------ */
 /* ------------------------------------------------------------------------ */

src/host/HostShare.cc

@@ -271,7 +271,7 @@ ostream& operator<<(ostream& os, HostShare& hs)
     os << hs.to_xml(str);
 
     return os;
-};
+}
 
 /* ------------------------------------------------------------------------ */
 /* ------------------------------------------------------------------------ */

src/im/InformationManager.cc

@@ -99,7 +99,7 @@ int InformationManager::start()
     rc = pthread_create(&im_thread,&pattr,im_action_loop,(void *) this);
 
     return rc;
-};
+}
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */

src/im/InformationManagerDriver.cc

@@ -32,7 +32,7 @@ void InformationManagerDriver::monitor (
     os << "MONITOR " << oid << " " << host << endl;
 
     write(os);
-};
+}
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */

src/image/Image.cc

@@ -50,7 +50,7 @@ Image::Image(int _uid, ImageTemplate * _image_template):
     {
         image_template = new ImageTemplate;
     }
-};
+}
 
 Image::~Image()
 {
@@ -58,7 +58,7 @@ Image::~Image()
     {
         delete image_template;
     }
-};
+}
 
 /* ************************************************************************ */
 /* Image :: Database Access Functions                                        */
@@ -415,8 +415,7 @@ ostream& operator<<(ostream& os, Image& image)
 	os << image.to_xml(image_str);
 
     return os;
-};
-
+}
 
 /* ------------------------------------------------------------------------ */
 /* ------------------------------------------------------------------------ */

src/lcm/LifeCycleManager.cc

@@ -55,7 +55,7 @@ int LifeCycleManager::start()
     rc = pthread_create(&lcm_thread,&pattr,lcm_action_loop,(void *) this);
 
     return rc;
-};
+}
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */

src/log/Log.cc

@@ -50,7 +50,7 @@ FileLog::FileLog(const string&   file_name,
     {
         file.close();
     }
-};
+}
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */

src/log/NebulaLog.cc

@@ -23,4 +23,5 @@
 Log * NebulaLog::logger;
 
 /* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+

src/mad/Mad.cc

@@ -164,11 +164,12 @@ int Mad::start()
         
         if ( sudo_execution == true )
         {
-            rc = execlp("sudo","sudo","-H","-u",owner,executable,arguments,NULL);
+            rc = execlp("sudo","sudo","-H","-u",owner,executable,arguments,
+                     (char *) NULL);
         }
         else
         {
-            rc = execlp(executable,executable,arguments,NULL);            
+            rc = execlp(executable,executable,arguments,(char*)NULL);            
         }
 
         goto error_exec;

src/mad/MadManager.cc

@@ -29,7 +29,7 @@
 MadManager::MadManager(vector<const Attribute*>& _mads):mad_conf(_mads)
 {
     pthread_mutex_init(&mutex,0);
-};
+}
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
@@ -37,7 +37,7 @@ MadManager::MadManager(vector<const Attribute*>& _mads):mad_conf(_mads)
 MadManager::~MadManager()
 {   
     pthread_mutex_destroy(&mutex);
-};
+}
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
@@ -66,7 +66,7 @@ void MadManager::mad_manager_system_init()
     sigemptyset(&act.sa_mask);
 
     sigaction(SIGPIPE,&act,NULL);
-};
+}
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
@@ -335,4 +335,4 @@ void MadManager::listener()
             }
         }
     }
-};
+}

src/rm/RequestManagerPoolInfo.cc

@@ -109,4 +109,5 @@ error_common:
 }
 
 /* -------------------------------------------------------------------------- */
-/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+

src/vnm/VirtualNetwork.cc

@@ -683,3 +683,4 @@ int VirtualNetwork::nic_attribute(VectorAttribute *nic, int vid)
 
 /* -------------------------------------------------------------------------- */
 /* -------------------------------------------------------------------------- */
+