style fixes

9 files changed, 59 insertions, 41 deletions

diff --git a/cpp/demo/Database/Oracle/occi/DeptI.cpp b/cpp/demo/Database/Oracle/occi/DeptI.cpp
index 4427287f8de..0703cfb9fac 100644
--- a/cpp/demo/Database/Oracle/occi/DeptI.cpp
+++ b/cpp/demo/Database/Oracle/occi/DeptI.cpp
@@ -89,7 +89,8 @@ DeptI::getDesc(const Ice::Current& current)
     return result;
 }
     
-void DeptI::updateField(const string& field, const string& newValue, const Ice::Current& current)
+void 
+DeptI::updateField(const string& field, const string& newValue, const Ice::Current& current)
 {
     Ref<DEPT_T> deptRef = decodeRef(current.id.name, _factory->getEnv(), _conh->connection());
 	    
@@ -109,7 +110,8 @@ void DeptI::updateField(const string& field, const string& newValue, const Ice::
     _conh->commit();
 }
 
-void DeptI::remove(const Ice::Current& current)
+void 
+DeptI::remove(const Ice::Current& current)
 {
     Ref<DEPT_T> deptRef = decodeRef(current.id.name, _factory->getEnv(), _conh->connection());
     deptRef->markDelete();
diff --git a/cpp/demo/Database/Oracle/occi/EmpI.cpp b/cpp/demo/Database/Oracle/occi/EmpI.cpp
index 728a30c5920..d591542cafe 100644
--- a/cpp/demo/Database/Oracle/occi/EmpI.cpp
+++ b/cpp/demo/Database/Oracle/occi/EmpI.cpp
@@ -62,7 +62,8 @@ EmpI::getDesc(const Ice::Current& current)
     return result;
 }
     
-void EmpI::updateField(const string& field, const string& newValue, const Ice::Current& current)
+void 
+EmpI::updateField(const string& field, const string& newValue, const Ice::Current& current)
 {
     Ref<EMP_T> empRef = decodeRef(current.id.name, _factory->getEnv(), _conh->connection());
     
@@ -121,7 +122,8 @@ void EmpI::updateField(const string& field, const string& newValue, const Ice::C
     _conh->commit();
 }
 
-void EmpI::updateMgr(int newMgr, const Ice::Current& current)
+void 
+EmpI::updateMgr(int newMgr, const Ice::Current& current)
 {
     Ref<EMP_T> empRef = decodeRef(current.id.name, _factory->getEnv(), _conh->connection());
     
@@ -143,7 +145,8 @@ void EmpI::updateMgr(int newMgr, const Ice::Current& current)
     _conh->commit();
 }
 
-void EmpI::updateDept(int newDept, const Ice::Current& current)
+void 
+EmpI::updateDept(int newDept, const Ice::Current& current)
 {
     Ref<EMP_T> empRef = decodeRef(current.id.name, _factory->getEnv(), _conh->connection());
     
@@ -165,7 +168,8 @@ void EmpI::updateDept(int newDept, const Ice::Current& current)
     _conh->commit();
 }
 
-void EmpI::remove(const Ice::Current& current)
+void 
+EmpI::remove(const Ice::Current& current)
 {
     Ref<EMP_T> empRef = decodeRef(current.id.name, _factory->getEnv(), _conh->connection());
     empRef->markDelete();
diff --git a/cpp/demo/Database/Oracle/proc/CurrentSqlContext.pc b/cpp/demo/Database/Oracle/proc/CurrentSqlContext.pc
index 973e4ce018a..862196b8718 100644
--- a/cpp/demo/Database/Oracle/proc/CurrentSqlContext.pc
+++ b/cpp/demo/Database/Oracle/proc/CurrentSqlContext.pc
@@ -62,7 +62,7 @@ public:
 		(*_current)[_index] = 0;
 		EXEC SQL CONTEXT USE :ctx;
 
-		struct sqlca sqlca;
+		sqlca sqlca;
 		EXEC SQL ROLLBACK RELEASE;
 		EXEC SQL CONTEXT FREE :ctx;
 	    }
@@ -128,7 +128,7 @@ CurrentSqlContext::operator sql_context() const
 	//
 	// Allocate and connect
 	//
-	struct sqlca sqlca;
+	sqlca sqlca;
 	
 	EXEC SQL CONTEXT ALLOCATE :ctx;
 	EXEC SQL CONTEXT USE :ctx;
diff --git a/cpp/demo/Database/Oracle/proc/DeptFactoryI.pc b/cpp/demo/Database/Oracle/proc/DeptFactoryI.pc
index ed4566e150e..1d72b58d0db 100644
--- a/cpp/demo/Database/Oracle/proc/DeptFactoryI.pc
+++ b/cpp/demo/Database/Oracle/proc/DeptFactoryI.pc
@@ -25,7 +25,7 @@ DeptFactoryI::DeptFactoryI(const CurrentSqlContext& currentCtx, const string& de
 HR::DeptPrx 
 DeptFactoryI::createDept(int key, const HR::DeptDesc& desc, const Ice::Current& current)
 {
-    struct sqlca sqlca;
+    sqlca sqlca;
     EXEC SQL BEGIN DECLARE SECTION;
     sql_context ctx = _currentCtx;
     int deptno = key;
@@ -48,7 +48,7 @@ EXEC SQL WHENEVER NOT FOUND DO break;
 HR::DeptPrxSeq 
 DeptFactoryI::findAll(const Ice::Current& current)
 {
-    struct sqlca sqlca;
+    sqlca sqlca;
     EXEC SQL BEGIN DECLARE SECTION;
     sql_context ctx = _currentCtx;
     int deptno;
@@ -79,7 +79,7 @@ DeptFactoryI::findAll(const Ice::Current& current)
 HR::DeptPrxSeq 
 DeptFactoryI::findByName(const string& name, const Ice::Current& current)
 {
-    struct sqlca sqlca;
+    sqlca sqlca;
     EXEC SQL BEGIN DECLARE SECTION;
     const char* dname = name.c_str();
     sql_context ctx = _currentCtx;
diff --git a/cpp/demo/Database/Oracle/proc/DeptI.pc b/cpp/demo/Database/Oracle/proc/DeptI.pc
index e60e6cfd324..7a9d2c63f1c 100644
--- a/cpp/demo/Database/Oracle/proc/DeptI.pc
+++ b/cpp/demo/Database/Oracle/proc/DeptI.pc
@@ -25,7 +25,7 @@ DeptI::DeptI(const CurrentSqlContext& currentCtx, const string& empCategory) :
 void 
 DeptI::ice_ping(const Ice::Current& current) const
 {
-    struct sqlca sqlca;
+    sqlca sqlca;
     EXEC SQL BEGIN DECLARE SECTION;
     sql_context ctx = _currentCtx;
     int deptno = decodeName(current.id.name);
@@ -45,7 +45,7 @@ DeptI::ice_ping(const Ice::Current& current) const
 HR::EmpPrx 
 DeptI::createEmp(int key, const HR::EmpDesc& desc, const Ice::Current& current)
 {
-    struct sqlca sqlca;
+    sqlca sqlca;
     EXEC SQL BEGIN DECLARE SECTION;
     sql_context ctx = _currentCtx;
     int deptno = decodeName(current.id.name);
@@ -88,7 +88,7 @@ DeptI::createEmp(int key, const HR::EmpDesc& desc, const Ice::Current& current)
 HR::DeptDesc 
 DeptI::getDesc(const Ice::Current& current)
 {
-    struct sqlca sqlca;
+    sqlca sqlca;
     EXEC SQL BEGIN DECLARE SECTION;
     int deptno = decodeName(current.id.name);
     sql_context ctx = _currentCtx;
@@ -130,12 +130,13 @@ DeptI::getDesc(const Ice::Current& current)
     return result;
 }
     
-void DeptI::updateField(const string& field, const string& newValue, const Ice::Current& current)
+void 
+DeptI::updateField(const string& field, const string& newValue, const Ice::Current& current)
 {
     const string updateDeptStr =
 	"UPDATE DEPT SET " + field + " = '" + newValue + "' WHERE DEPTNO = " + current.id.name;
     
-    struct sqlca sqlca;
+    sqlca sqlca;
     EXEC SQL BEGIN DECLARE SECTION;
     const char* updateDept = updateDeptStr.c_str();
     sql_context ctx = _currentCtx;
@@ -146,9 +147,10 @@ void DeptI::updateField(const string& field, const string& newValue, const Ice::
     EXEC SQL COMMIT;
 }
 
-void DeptI::remove(const Ice::Current& current)
+void
+DeptI::remove(const Ice::Current& current)
 {
-    struct sqlca sqlca;
+    sqlca sqlca;
     EXEC SQL BEGIN DECLARE SECTION;
     int deptno = decodeName(current.id.name);
     sql_context ctx = _currentCtx;
@@ -160,7 +162,7 @@ void DeptI::remove(const Ice::Current& current)
 }
 
 //
-// Cursor-base functions
+// Cursor-based functions
 //
 
 EXEC SQL WHENEVER NOT FOUND DO break;
@@ -168,7 +170,7 @@ EXEC SQL WHENEVER NOT FOUND DO break;
 HR::EmpPrxSeq 
 DeptI::findAll(const Ice::Current& current)
 {
-    struct sqlca sqlca;
+    sqlca sqlca;
     EXEC SQL BEGIN DECLARE SECTION;
     int deptno = decodeName(current.id.name);
     sql_context ctx = _currentCtx;
@@ -200,7 +202,7 @@ DeptI::findAll(const Ice::Current& current)
 HR::EmpPrxSeq 
 DeptI::findByName(const string& name, const Ice::Current& current)
 {
-    struct sqlca sqlca;
+    sqlca sqlca;
     EXEC SQL BEGIN DECLARE SECTION;
     int deptno = decodeName(current.id.name);
     const char* ename = name.c_str();
diff --git a/cpp/demo/Database/Oracle/proc/EmpI.pc b/cpp/demo/Database/Oracle/proc/EmpI.pc
index 5b87e3a84d1..e74887a939d 100644
--- a/cpp/demo/Database/Oracle/proc/EmpI.pc
+++ b/cpp/demo/Database/Oracle/proc/EmpI.pc
@@ -19,14 +19,15 @@ using namespace std;
 EmpI::EmpI(const CurrentSqlContext& currentCtx,
 	   const string& empCategory, const string& deptCategory) :
     _currentCtx(currentCtx), 
-    _empCategory(empCategory), _deptCategory(deptCategory)
+    _empCategory(empCategory), 
+    _deptCategory(deptCategory)
 {
 }
 
 void 
 EmpI::ice_ping(const Ice::Current& current) const
 {
-    struct sqlca sqlca;
+    sqlca sqlca;
     EXEC SQL BEGIN DECLARE SECTION;
     sql_context ctx = _currentCtx;
     int empno = decodeName(current.id.name);
@@ -46,7 +47,7 @@ EmpI::ice_ping(const Ice::Current& current) const
 HR::EmpDesc 
 EmpI::getDesc(const Ice::Current& current)
 {
-    struct sqlca sqlca;
+    sqlca sqlca;
     EXEC SQL BEGIN DECLARE SECTION;
     sql_context ctx = _currentCtx;
     int empno = decodeName(current.id.name);
@@ -68,7 +69,8 @@ EmpI::getDesc(const Ice::Current& current)
     
     EXEC SQL CONTEXT USE :ctx;
     EXEC SQL SELECT ENAME, JOB, MGR, HIREDATE, SAL, COMM, DEPTNO 
-	     INTO :ename:enameInd, :job:jobInd, :mgr:mgrInd, :hiredate:hiredateInd, :sal:salInd, :comm:commInd, :deptno:deptnoInd
+	     INTO :ename:enameInd, :job:jobInd, :mgr:mgrInd, :hiredate:hiredateInd, :sal:salInd, :comm:commInd, 
+                  :deptno:deptnoInd
              FROM EMP WHERE EMPNO = :empno;
     EXEC SQL COMMIT;
   
@@ -112,12 +114,13 @@ EmpI::getDesc(const Ice::Current& current)
     return result;
 }
     
-void EmpI::updateField(const string& field, const string& newValue, const Ice::Current& current)
+void 
+EmpI::updateField(const string& field, const string& newValue, const Ice::Current& current)
 {
     const string updateEmpStr =
 	"UPDATE EMP SET " + field + " = '" + newValue + "' WHERE EMPNO = " + current.id.name;
 
-    struct sqlca sqlca;
+    sqlca sqlca;
     EXEC SQL BEGIN DECLARE SECTION;
     const char* updateEmp = updateEmpStr.c_str();
     sql_context ctx = _currentCtx;
@@ -128,9 +131,10 @@ void EmpI::updateField(const string& field, const string& newValue, const Ice::C
     EXEC SQL COMMIT;
 }
 
-void EmpI::updateMgr(int newMgr, const Ice::Current& current)
+void 
+EmpI::updateMgr(int newMgr, const Ice::Current& current)
 {
-    struct sqlca sqlca;
+    sqlca sqlca;
     EXEC SQL BEGIN DECLARE SECTION;
     sql_context ctx = _currentCtx;
     int empno = decodeName(current.id.name);
@@ -143,9 +147,10 @@ void EmpI::updateMgr(int newMgr, const Ice::Current& current)
     EXEC SQL COMMIT;
 }
 
-void EmpI::updateDept(int newDept, const Ice::Current& current)
+void 
+EmpI::updateDept(int newDept, const Ice::Current& current)
 {
-    struct sqlca sqlca;
+    sqlca sqlca;
     EXEC SQL BEGIN DECLARE SECTION;
     sql_context ctx = _currentCtx;
     int empno = decodeName(current.id.name);
@@ -158,9 +163,10 @@ void EmpI::updateDept(int newDept, const Ice::Current& current)
     EXEC SQL COMMIT;
 }
 
-void EmpI::remove(const Ice::Current& current)
+void 
+EmpI::remove(const Ice::Current& current)
 {
-    struct sqlca sqlca;
+    sqlca sqlca;
     EXEC SQL BEGIN DECLARE SECTION;
     sql_context ctx = _currentCtx;
     int empno = decodeName(current.id.name);
diff --git a/cpp/demo/Database/Oracle/proc/Server.pc b/cpp/demo/Database/Oracle/proc/Server.pc
index 6905ea0d1f7..a0a0d80e083 100644
--- a/cpp/demo/Database/Oracle/proc/Server.pc
+++ b/cpp/demo/Database/Oracle/proc/Server.pc
@@ -61,7 +61,7 @@ private:
 int
 main(int argc, char* argv[])
 {
-    struct sqlca sqlca;
+    sqlca sqlca;
     EXEC SQL CONTEXT USE DEFAULT;
     EXEC SQL ENABLE THREADS;
     
diff --git a/cpp/demo/Database/Oracle/proc/Util.h b/cpp/demo/Database/Oracle/proc/Util.h
index df2aafc78e6..57272039cbc 100644
--- a/cpp/demo/Database/Oracle/proc/Util.h
+++ b/cpp/demo/Database/Oracle/proc/Util.h
@@ -14,7 +14,7 @@
 #include <string>
 #include <sqlca.h>
 
-void handleSqlError(const struct sqlca&, sql_context);
+void handleSqlError(const sqlca&, sql_context);
 void handleNotFound(const Ice::Current&, sql_context);
 
 int decodeName(const std::string&);
diff --git a/cpp/demo/Database/Oracle/proc/Util.pc b/cpp/demo/Database/Oracle/proc/Util.pc
index 0ede1e2d75b..9e96d81d88a 100644
--- a/cpp/demo/Database/Oracle/proc/Util.pc
+++ b/cpp/demo/Database/Oracle/proc/Util.pc
@@ -14,7 +14,8 @@
 
 using namespace std;
 
-void handleSqlError(const struct sqlca& badca, sql_context sc)
+void 
+handleSqlError(const sqlca& badca, sql_context sc)
 {
     //
     // First rollback transaction
@@ -23,7 +24,7 @@ void handleSqlError(const struct sqlca& badca, sql_context sc)
     sql_context ctx = sc;
     EXEC SQL END DECLARE SECTION;
     
-    struct sqlca sqlca;
+    sqlca sqlca;
     EXEC SQL CONTEXT USE :ctx;
     EXEC SQL ROLLBACK;
 
@@ -31,7 +32,8 @@ void handleSqlError(const struct sqlca& badca, sql_context sc)
     throw HR::SqlException(msg);
 }
 
-void handleNotFound(const Ice::Current& current, sql_context sc)
+void 
+handleNotFound(const Ice::Current& current, sql_context sc)
 {
     //
     // First rollback transaction
@@ -40,14 +42,15 @@ void handleNotFound(const Ice::Current& current, sql_context sc)
     sql_context ctx = sc;
     EXEC SQL END DECLARE SECTION;
     
-    struct sqlca sqlca;
+    sqlca sqlca;
     EXEC SQL CONTEXT USE :ctx;
     EXEC SQL ROLLBACK;
 
     throw Ice::ObjectNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
 }
 
-int decodeName(const string& name)
+int 
+decodeName(const string& name)
 {
     int result = 0;
     istringstream is(name);
@@ -60,7 +63,8 @@ int decodeName(const string& name)
     return result;
 }
 
-string encodeName(int n)
+string 
+encodeName(int n)
 {
     ostringstream os;
     os << n;