vni25c gcc33 issue

Wolfgang Rosenauer <[email protected]> Wed, 2 Apr 2003 08:35:12 +0200 (CEST)
Newsgroups gmane.comp.db.sapdb.sources
Message-ID <[email protected]>
Hi,

there is some code in sys/src/ni/vni25c which is not longer accepted by
gcc 3.3. Within the function WriteData() the macro PRD is used where the
parameter x can have different data (declared as float).
But the macro calls PrintWizString (int ii, char* x).
This was always bogus and now it isn't accepted anymore.

The attached patch fix this by using a vararg function instead the macro.
Please have a look at it and integrate it in your source if it fits.
If you touch that file it could be cleaned up by using ANSI-prototypes
instead the old-style ones ;-)

CU,

   Wolfgang ([email protected])

-- 
SuSE Linux AG,          Tel:   +49-911-74053-0
Deutschherrnstr. 15-19  Fax:   +49-911-74053-489
90429 Nuernberg,
Germany                 WWW:   http://www.suse.de/
patch (text/plain, 20.4 KB)
--- SAPDB_ORG/sys/src/ni/vni25c
+++ SAPDB_ORG/sys/src/ni/vni25c
@@ -99,6 +99,7 @@
 Code    :
 /*PRETTY*/
 
+#include <stdarg.h>
 #include <time.h> 
 
 typedef enum { Time, Date, Double , Float , Long , Int , String } DType ;
@@ -693,8 +694,9 @@
 
 static void WriteTitle ( ) ;
 static void WriteData ( ) ;
-static void PrintWizNumeric( ) ;
-static void PrintWizString ( ) ;
+static void PrintWiz(int, ...);
+static void PrintWizNumeric(int, double) ;
+static void PrintWizString (int, char*) ;
 static int  Max100 () ;
 static float  Percent () ;
 static void OpenOutputFile ( ) ; 
@@ -929,17 +931,22 @@
 		fprintf (fo,"\n") ;
 }
 
-#define PRD(x) \
-    { \
-	if ( S[ii].DataType != String ) \
-	{ \
-	    double z = (double) (x) ; \
-	    PrintWizNumeric ( ii , z ) ; \
-	} \
-	else \
-	    PrintWizString ( ii , x ) ; \
-    } \
-    break 
+static void PrintWiz(int ii, ...)
+{
+  va_list ap;
+  va_start (ap, ii);
+  if (S[ii].DataType != String)
+  {
+     double d = va_arg (ap, double);
+     PrintWizNumeric (ii, d);
+  }
+  else
+  {
+      char *c = va_arg (ap, char *);
+      PrintWizString (ii, c);
+  }
+  va_end (ap);
+}
 
 static void WriteData (I) 
 int	*I ;
@@ -954,347 +961,347 @@
 	switch (ii)
 	{
 	    case e_time :
-		PRD (WT) ;
+		PrintWiz (ii, WT) ;
 	    case e_datacache_acc : 
-		PRD (pm*mon.DataCacheAccesses) ;
+		PrintWiz (ii, pm*mon.DataCacheAccesses) ;
 	    case e_cocache_acc : 
-		PRD (pm*mon.ConverterCacheAccesses) ;
+		PrintWiz (ii, pm*mon.ConverterCacheAccesses) ;
 	    case e_cacache_acc : 
-		PRD (pm*mon.CatalogCacheAccesses) ;
+		PrintWiz (ii, pm*mon.CatalogCacheAccesses) ;
 	    case e_datacache_hit : 
-		PRD (Max100(mon.DataCacheHitRate)) ;
+		PrintWiz (ii, Max100(mon.DataCacheHitRate)) ;
 	    case e_cocache_hit : 
-		PRD (Max100(mon.ConverterCacheHitRate)) ;
+		PrintWiz (ii, Max100(mon.ConverterCacheHitRate)) ;
 	    case e_cacache_hit : 
-		PRD (Max100(mon.CatalogCacheHitRate)) ;
+		PrintWiz (ii, Max100(mon.CatalogCacheHitRate)) ;
 	    case e_executes :
-		PRD (pm*mon.Executes) ;
+		PrintWiz (ii, pm*mon.Executes) ;
 	    case e_sql_commands :
-		PRD (pm*mon.SqlCommands) ;
+		PrintWiz (ii, pm*mon.SqlCommands) ;
 	    case e_write_trans : 
-		PRD (pm*mon.WriteTransactions) ;
+		PrintWiz (ii, pm*mon.WriteTransactions) ;
 	    case e_commits : 
-		PRD (pm*mon.Commits) ;
+		PrintWiz (ii, pm*mon.Commits) ;
 	    case e_rollbacks : 
-		PRD (pm*mon.Rollbacks) ;
+		PrintWiz (ii, pm*mon.Rollbacks) ;
 	    case e_prepares : 
-		PRD (pm*mon.Prepares) ;
+		PrintWiz (ii, pm*mon.Prepares) ;
 	    case e_phys_reads :
-		PRD (pm*mon.PhysicalReads) ;
+		PrintWiz (ii, pm*mon.PhysicalReads) ;
  	    case e_phys_writes :
-		PRD (pm*mon.PhysicalWrites) ;
+		PrintWiz (ii, pm*mon.PhysicalWrites) ;
 	    case e_temp_page_writes :
-		PRD (pm*mon.TempPagePhysicalWrites) ;
+		PrintWiz (ii, pm*mon.TempPagePhysicalWrites) ;
 	    case e_temp_page_vwrites :
-		PRD (pm*mon.TempPageVirtualWrites) ;
+		PrintWiz (ii, pm*mon.TempPageVirtualWrites) ;
 	    case e_temp_page_reads :
-		PRD (pm*mon.TempPagePhysicalReads) ;
+		PrintWiz (ii, pm*mon.TempPagePhysicalReads) ;
 	    case e_temp_page_vreads :
-		PRD (pm*mon.TempPageVirtualReads) ;
+		PrintWiz (ii, pm*mon.TempPageVirtualReads) ;
 	    case e_log_writes :
-		PRD (pm*mon.LogPagePhysicalWrites) ;
+		PrintWiz (ii, pm*mon.LogPagePhysicalWrites) ;
 	    case e_log_reads :
-		PRD (pm*mon.LogPagePhysicalReads) ;
+		PrintWiz (ii, pm*mon.LogPagePhysicalReads) ;
 	    case e_log_queue_inserts :
-		PRD (pm*mon.LogQueueInserts);
+		PrintWiz (ii, pm*mon.LogQueueInserts);
 	    case e_log_queue_overfl :
-		PRD (mon.LogQueueOverflows);
+		PrintWiz (ii, mon.LogQueueOverflows);
 	    case e_group_commits :
-		PRD (pm*mon.LogQueueGroupCommits);
+		PrintWiz (ii, pm*mon.LogQueueGroupCommits);
 	    case e_lock_colls :		
-		PRD (pm*mon.LockListCollisions) ;
+		PrintWiz (ii, pm*mon.LockListCollisions) ;
 	    case e_lock_row_entries :
-		PRD (pm*mon.LockListInsertedRowEntries) ;
+		PrintWiz (ii, pm*mon.LockListInsertedRowEntries) ;
 	    case e_lock_table_entries :  
-		PRD (pm*mon.LockListInsertedTableEntries) ;
+		PrintWiz (ii, pm*mon.LockListInsertedTableEntries) ;
 	    case e_kb_calls :
-		PRD (pm*mon.KbCalls) ;
+		PrintWiz (ii, pm*mon.KbCalls) ;
 	    case e_sel_acc :
-		PRD (pm*mon.SelectsAndFetches) ;
+		PrintWiz (ii, pm*mon.SelectsAndFetches) ;
  	    case e_ins_acc :
-		PRD (pm*mon.Inserts) ;
+		PrintWiz (ii, pm*mon.Inserts) ;
  	    case e_upd_acc :
-		PRD (pm*mon.Updates) ;
+		PrintWiz (ii, pm*mon.Updates) ;
 	    case e_del_acc :
-		PRD (pm*mon.Deletes) ;
+		PrintWiz (ii, pm*mon.Deletes) ;
  	    case e_key_acc :
-		PRD (pm*mon.PrimaryKeyAccesses) ;
+		PrintWiz (ii, pm*mon.PrimaryKeyAccesses) ;
  	    case e_key_range_acc :
-		PRD (pm*mon.PrimaryKeyRangeAccesses) ;
+		PrintWiz (ii, pm*mon.PrimaryKeyRangeAccesses) ;
  	    case e_index_acc :
-		PRD (pm*mon.IndexAccesses) ;
+		PrintWiz (ii, pm*mon.IndexAccesses) ;
             case e_index_range_acc :
-		PRD (pm*mon.IndexRangeAccesses) ;
+		PrintWiz (ii, pm*mon.IndexRangeAccesses) ;
  	    case e_iso_index_acc :
-		PRD (pm*mon.IsolatedIndexAccesses) ;
+		PrintWiz (ii, pm*mon.IsolatedIndexAccesses) ;
  	    case e_iso_index_range_acc :
-		PRD (pm*mon.IsolatedIndexRangeAccesses) ;
+		PrintWiz (ii, pm*mon.IsolatedIndexRangeAccesses) ;
 	    case e_iso_index_scan_acc :
-		PRD (pm*mon.IsolatedIndexScans) ;
+		PrintWiz (ii, pm*mon.IsolatedIndexScans) ;
             case e_table_scan_acc :
-		PRD (pm*mon.TableScans) ;
+		PrintWiz (ii, pm*mon.TableScans) ;
             case e_sel_qual:
-		PRD (pm*mon.SelectsAndFetchesRowsQual) ;
+		PrintWiz (ii, pm*mon.SelectsAndFetchesRowsQual) ;
             case e_ins_qual:
-		PRD (pm*mon.InsertsRowsInserted);
+		PrintWiz (ii, pm*mon.InsertsRowsInserted);
             case e_upd_qual:
-		PRD (pm*mon.UpdatesRowsUpdated) ;
+		PrintWiz (ii, pm*mon.UpdatesRowsUpdated) ;
             case e_del_qual:
-		PRD (pm*mon.DeletesRowsDeleted) ;
+		PrintWiz (ii, pm*mon.DeletesRowsDeleted) ;
  	    case e_key_qual :
-		PRD (pm*mon.PrimaryKeyAccessesRowsQual) ;
+		PrintWiz (ii, pm*mon.PrimaryKeyAccessesRowsQual) ;
  	    case e_key_range_qual :
-		PRD (pm*mon.PrimaryKeyRangeAccessesRowsQual) ;
+		PrintWiz (ii, pm*mon.PrimaryKeyRangeAccessesRowsQual) ;
  	    case e_index_qual :
-		PRD (pm*mon.IndexAccessesRowsQual) ;
+		PrintWiz (ii, pm*mon.IndexAccessesRowsQual) ;
             case e_index_range_qual :
-		PRD (pm*mon.IndexRangeAccessesRowsQual) ;
+		PrintWiz (ii, pm*mon.IndexRangeAccessesRowsQual) ;
  	    case e_iso_index_qual :
-		PRD (pm*mon.IsolatedIndexAccessesRowsQual) ;
+		PrintWiz (ii, pm*mon.IsolatedIndexAccessesRowsQual) ;
  	    case e_iso_index_range_qual :
-		PRD (pm*mon.IsolatedIndexRangeAccessesRowsQual) ;
+		PrintWiz (ii, pm*mon.IsolatedIndexRangeAccessesRowsQual) ;
 	    case e_iso_index_scan_qual :
-		PRD (pm*mon.IsolatedIndexScansRowsQual) ;
+		PrintWiz (ii, pm*mon.IsolatedIndexScansRowsQual) ;
             case e_table_scan_qual :
-		PRD (pm*mon.TableScansRowsQual) ;
+		PrintWiz (ii, pm*mon.TableScansRowsQual) ;
             case e_sel_read:
-		PRD (pm*mon.SelectsAndFetchesRowsRead) ;
+		PrintWiz (ii, pm*mon.SelectsAndFetchesRowsRead) ;
             case e_upd_read:
-		PRD (pm*mon.UpdatesRowsRead) ;
+		PrintWiz (ii, pm*mon.UpdatesRowsRead) ;
             case e_del_read:
-		PRD (pm*mon.DeletesRowsRead) ;
+		PrintWiz (ii, pm*mon.DeletesRowsRead) ;
  	    case e_key_read :
-		PRD (pm*mon.PrimaryKeyAccessesRowsRead) ;
+		PrintWiz (ii, pm*mon.PrimaryKeyAccessesRowsRead) ;
  	    case e_key_range_read :
-		PRD (pm*mon.PrimaryKeyRangeAccessesRowsRead) ;
+		PrintWiz (ii, pm*mon.PrimaryKeyRangeAccessesRowsRead) ;
  	    case e_index_read :
-		PRD (pm*mon.IndexAccessesRowsRead) ;
+		PrintWiz (ii, pm*mon.IndexAccessesRowsRead) ;
             case e_index_range_read :
-		PRD (pm*mon.IndexRangeAccessesRowsRead) ;
+		PrintWiz (ii, pm*mon.IndexRangeAccessesRowsRead) ;
  	    case e_iso_index_read :
-		PRD (pm*mon.IsolatedIndexAccessesRowsRead) ;
+		PrintWiz (ii, pm*mon.IsolatedIndexAccessesRowsRead) ;
  	    case e_iso_index_range_read :
-		PRD (pm*mon.IsolatedIndexRangeAccessesRowsRead) ;
+		PrintWiz (ii, pm*mon.IsolatedIndexRangeAccessesRowsRead) ;
 	    case e_iso_index_scan_read :
-		PRD (pm*mon.IsolatedIndexScansRowsRead) ;
+		PrintWiz (ii, pm*mon.IsolatedIndexScansRowsRead) ;
             case e_table_scan_read :
-		PRD (pm*mon.TableScansRowsRead) ;
+		PrintWiz (ii, pm*mon.TableScansRowsRead) ;
 	    case e_sel_hit :
 		zwi = Percent (mon.SelectsAndFetchesRowsQual
 			,mon.SelectsAndFetchesRowsRead) ;
-		PRD (zwi) ;
+		PrintWiz (ii, zwi) ;
  	    case e_upd_hit :
 		zwi = Percent (mon.UpdatesRowsUpdated, mon.UpdatesRowsRead) ;
-		PRD (zwi) ;
+		PrintWiz (ii, zwi) ;
 	    case e_del_hit :
 		zwi = Percent (mon.DeletesRowsDeleted,mon.DeletesRowsRead) ;
-		PRD (zwi) ;
+		PrintWiz (ii, zwi) ;
  	    case e_key_hit :
 		zwi = Percent (mon.PrimaryKeyAccessesRowsQual
 			,mon.PrimaryKeyAccessesRowsRead) ;
-		PRD (zwi) ;
+		PrintWiz (ii, zwi) ;
  	    case e_key_range_hit :
 		zwi = Percent (mon.PrimaryKeyRangeAccessesRowsQual
 			,mon.PrimaryKeyRangeAccessesRowsRead) ;
-		PRD (zwi) ;
+		PrintWiz (ii, zwi) ;
  	    case e_index_hit :
 		zwi = Percent (mon.IndexAccessesRowsQual
 			,mon.IndexAccessesRowsRead) ;
-		PRD (zwi) ;
+		PrintWiz (ii, zwi) ;
             case e_index_range_hit :
 		zwi = Percent (mon.IndexRangeAccessesRowsQual
 			,mon.IndexRangeAccessesRowsRead) ;
-		PRD (zwi) ;
+		PrintWiz (ii, zwi) ;
  	    case e_iso_index_hit :
 		zwi = Percent (mon.IsolatedIndexAccessesRowsQual
 			,mon.IsolatedIndexAccessesRowsRead) ;
-		PRD (zwi) ;
+		PrintWiz (ii, zwi) ;
  	    case e_iso_index_range_hit :
 		zwi = Percent (mon.IsolatedIndexRangeAccessesRowsQual
 			,mon.IsolatedIndexRangeAccessesRowsRead) ;
-		PRD (zwi) ;
+		PrintWiz (ii, zwi) ;
 	    case e_iso_index_scan_hit :
 		zwi = Percent (mon.IsolatedIndexScansRowsQual
 			,mon.IsolatedIndexScansRowsRead) ;
-		PRD (zwi) ;
+		PrintWiz (ii, zwi) ;
             case e_table_scan_hit :
 		zwi = Percent (mon.TableScansRowsQual
 			,mon.TableScansRowsRead) ;
-		PRD (zwi) ;
+		PrintWiz (ii, zwi) ;
 	    case e_wait_cnt_user :
-		PRD (pm*tas[T_USER].state_vwait);
+		PrintWiz (ii, pm*tas[T_USER].state_vwait);
 	    case e_vwait_time_user :
 		zwi = tas[T_USER].state_vwait ?
 		    tas[T_USER].avg_vwait_time/tas[T_USER].state_vwait : 0.0 ;
-		PRD (zwi);
+		PrintWiz (ii, zwi);
  	    case e_susp_cnt_user :
-		PRD (pm*tas[T_USER].state_vsusp);
+		PrintWiz (ii, pm*tas[T_USER].state_vsusp);
  	    case e_susp_time_user :
 		zwi = tas[T_USER].state_vsusp ?
 		    tas[T_USER].avg_vsusp_time/tas[T_USER].state_vsusp : 0.0 ;
-		PRD (zwi);
+		PrintWiz (ii, zwi);
 	    case e_rcvrpl_time_user:
 		zwi = tas[T_USER].rcv_rpl_count ? 
 	            tas[T_USER].avg_rcv_rpl_t/tas[T_USER].rcv_rpl_count : 0.0;
-		PRD (zwi);
+		PrintWiz (ii, zwi);
 	    case e_rcvrpl_long_user:
-		PRD (pm*tas[T_USER].rcv_rpl_long);
+		PrintWiz (ii, pm*tas[T_USER].rcv_rpl_long);
 	    case e_total_regcoll_rate:
 		zwi = tct.total_reg_collision ?
 		    tct.total_reg_collision/tct.total_reg_access*100.0 
 		    : 0.0 ;
-		PRD (zwi);
+		PrintWiz (ii, zwi);
             case e_dev_io_write_cnt_log1:  
-		PRD (pm*tas[T_LOGWR1].dev_io_writecnt) ;
+		PrintWiz (ii, pm*tas[T_LOGWR1].dev_io_writecnt) ;
             case e_dev_pg_write_cnt_log1:  
-		PRD (pm*tas[T_LOGWR1].dev_pg_writecnt) ;
+		PrintWiz (ii, pm*tas[T_LOGWR1].dev_pg_writecnt) ;
 	    case e_dev_io_time_log1:
 		zwi = tas[T_LOGWR1].dev_io_cnt ?
 		    tas[T_LOGWR1].avg_dev_io_tm / tas[T_LOGWR1].dev_io_cnt :
 		    0.0 ; 
-		PRD (zwi) ;
+		PrintWiz (ii, zwi) ;
 	    case e_self_io_write_cnt_log1:
-		PRD (pm*tas[T_LOGWR1].self_io_writecnt);
+		PrintWiz (ii, pm*tas[T_LOGWR1].self_io_writecnt);
             case e_self_pg_write_cnt_log1:  
-		PRD (pm*tas[T_LOGWR1].self_pg_writecnt) ;
+		PrintWiz (ii, pm*tas[T_LOGWR1].self_pg_writecnt) ;
 	    case e_self_io_time_log1:
 		zwi = tas[T_LOGWR1].self_io_cnt ?
 		    tas[T_LOGWR1].avg_self_io_tm / tas[T_LOGWR1].self_io_cnt :
 		    0.0 ; 
-		PRD (zwi) ;
+		PrintWiz (ii, zwi) ;
 
             case e_dev_io_cnt_user:
-                PRD (pm*tas[T_USER].dev_io_cnt) ;
+                PrintWiz (ii, pm*tas[T_USER].dev_io_cnt) ;
             case e_dev_io_time_user:
                 zwi = tas[T_USER].dev_io_cnt ?
                     tas[T_USER].avg_dev_io_tm / tas[T_USER].dev_io_cnt :
                     0.0 ;
-                PRD (zwi) ;
+                PrintWiz (ii, zwi) ;
             case e_self_io_cnt_user:
-                PRD (pm*tas[T_USER].self_io_cnt);
+                PrintWiz (ii, pm*tas[T_USER].self_io_cnt);
             case e_self_io_time_user:
                 zwi = tas[T_USER].self_io_cnt ?
                     tas[T_USER].avg_self_io_tm / tas[T_USER].self_io_cnt :
                     0.0 ;
-                PRD (zwi) ;
+                PrintWiz (ii, zwi) ;
 
 	    case e_cache_swaps :
-		PRD (pm*tas[T_USER].self_io_writecnt+pm*tas[T_USER].dev_io_writecnt);
+		PrintWiz (ii, pm*tas[T_USER].self_io_writecnt+pm*tas[T_USER].dev_io_writecnt);
             case e_dev_io_cnt_serv:
-                PRD (pm*tas[T_SERVER].dev_io_cnt) ;
+                PrintWiz (ii, pm*tas[T_SERVER].dev_io_cnt) ;
             case e_dev_pg_write_cnt_serv:
-                PRD (pm*tas[T_SERVER].dev_pg_writecnt) ;
+                PrintWiz (ii, pm*tas[T_SERVER].dev_pg_writecnt) ;
             case e_dev_io_time_serv:
                 zwi = tas[T_SERVER].dev_io_cnt ?
                     tas[T_SERVER].avg_dev_io_tm / tas[T_SERVER].dev_io_cnt :
                     0.0 ;
-                PRD (zwi) ;
+                PrintWiz (ii, zwi) ;
             case e_self_pg_write_cnt_serv:
-                PRD (pm*tas[T_SERVER].self_pg_writecnt);
+                PrintWiz (ii, pm*tas[T_SERVER].self_pg_writecnt);
             case e_self_io_cnt_serv:
-                PRD (pm*tas[T_SERVER].self_io_cnt);
+                PrintWiz (ii, pm*tas[T_SERVER].self_io_cnt);
             case e_self_io_time_serv:
                 zwi = tas[T_SERVER].self_io_cnt ?
                     tas[T_SERVER].avg_self_io_tm / tas[T_SERVER].self_io_cnt :
                     0.0 ;
-                PRD (zwi) ;
+                PrintWiz (ii, zwi) ;
 
 	    case e_convert_reg_get :
-		PRD (pm*RegionData[R_CONVERT].GetCnt) ;
+		PrintWiz (ii, pm*RegionData[R_CONVERT].GetCnt) ;
 	    case e_fbm_reg_get :
-		PRD (pm*RegionData[R_FBM].GetCnt) ;
+		PrintWiz (ii, pm*RegionData[R_FBM].GetCnt) ;
 	    case e_data_reg_get :
-		PRD (pm*RegionData[R_DATACACH].GetCnt) ;
+		PrintWiz (ii, pm*RegionData[R_DATACACH].GetCnt) ;
 /*
 	    case e_lock_reg_get :
-		PRD (pm*RegionData[R_LOCK].GetCnt) ;
+		PrintWiz (ii, pm*RegionData[R_LOCK].GetCnt) ;
 */
 	    case e_log_reg_get :
-		PRD (pm*RegionData[R_LOG].GetCnt) ;
+		PrintWiz (ii, pm*RegionData[R_LOG].GetCnt) ;
 	    case e_logwrite_reg_get :
-		PRD (pm*RegionData[R_LOGWRITE].GetCnt) ;
+		PrintWiz (ii, pm*RegionData[R_LOGWRITE].GetCnt) ;
 	    case e_permfdir_reg_get :
-		PRD (pm*RegionData[R_PERMFDIR].GetCnt) ;
+		PrintWiz (ii, pm*RegionData[R_PERMFDIR].GetCnt) ;
 	    case e_tempfdir_reg_get :
-		PRD (pm*RegionData[R_TEMPFDIR].GetCnt) ;
+		PrintWiz (ii, pm*RegionData[R_TEMPFDIR].GetCnt) ;
 	    case e_trace_reg_get :
-		PRD (pm*RegionData[R_TRACE].GetCnt) ;
+		PrintWiz (ii, pm*RegionData[R_TRACE].GetCnt) ;
 	    case e_datan_reg_get  :
-		PRD (pm*RegionData[R_DATAn].GetCnt) ;
+		PrintWiz (ii, pm*RegionData[R_DATAn].GetCnt) ;
 	    case e_tree_reg_get :
-		PRD (pm*RegionData[R_TREEn].GetCnt) ;
+		PrintWiz (ii, pm*RegionData[R_TREEn].GetCnt) ;
 	    case e_splittn_reg_get :
-		PRD (pm*RegionData[R_SPLITTn].GetCnt) ;
+		PrintWiz (ii, pm*RegionData[R_SPLITTn].GetCnt) ;
 	    case e_transn_reg_get :
-		PRD (pm*RegionData[R_TRANSn].GetCnt) ;
+		PrintWiz (ii, pm*RegionData[R_TRANSn].GetCnt) ;
 	    case e_tabn_reg_get :
-		PRD (pm*RegionData[R_TABn].GetCnt) ;
+		PrintWiz (ii, pm*RegionData[R_TABn].GetCnt) ;
 	    case e_rown_reg_get :
-		PRD (pm*RegionData[R_ROWn].GetCnt) ;
+		PrintWiz (ii, pm*RegionData[R_ROWn].GetCnt) ;
 
 	    case e_convert_reg_col :
-		PRD (RegionData[R_CONVERT].CollProz) ;
+		PrintWiz (ii, RegionData[R_CONVERT].CollProz) ;
 	    case e_fbm_reg_col :
-		PRD (RegionData[R_FBM].CollProz) ;
+		PrintWiz (ii, RegionData[R_FBM].CollProz) ;
 	    case e_data_reg_col :
-		PRD (RegionData[R_DATACACH].CollProz) ;
+		PrintWiz (ii, RegionData[R_DATACACH].CollProz) ;
 /*
 	    case e_lock_reg_col :
-		PRD (RegionData[R_LOCK].CollProz) ;
+		PrintWiz (ii, RegionData[R_LOCK].CollProz) ;
 */
 	    case e_log_reg_col :
-		PRD (RegionData[R_LOG].CollProz) ;
+		PrintWiz (ii, RegionData[R_LOG].CollProz) ;
 	    case e_logwrite_reg_col :
-		PRD (RegionData[R_LOGWRITE].CollProz) ;
+		PrintWiz (ii, RegionData[R_LOGWRITE].CollProz) ;
 	    case e_permfdir_reg_col :
-		PRD (RegionData[R_PERMFDIR].CollProz) ;
+		PrintWiz (ii, RegionData[R_PERMFDIR].CollProz) ;
 	    case e_tempfdir_reg_col :
-		PRD (RegionData[R_TEMPFDIR].CollProz) ;
+		PrintWiz (ii, RegionData[R_TEMPFDIR].CollProz) ;
 	    case e_trace_reg_col :
-		PRD (RegionData[R_TRACE].CollProz) ;
+		PrintWiz (ii, RegionData[R_TRACE].CollProz) ;
 	    case e_datan_reg_col  :
-		PRD (RegionData[R_DATAn].CollProz) ;
+		PrintWiz (ii, RegionData[R_DATAn].CollProz) ;
 	    case e_tree_reg_col :
-		PRD (RegionData[R_TREEn].CollProz) ;
+		PrintWiz (ii, RegionData[R_TREEn].CollProz) ;
 	    case e_splittn_reg_col :
-		PRD (RegionData[R_SPLITTn].CollProz) ;
+		PrintWiz (ii, RegionData[R_SPLITTn].CollProz) ;
 	    case e_transn_reg_col :
-		PRD (RegionData[R_TRANSn].CollProz) ;
+		PrintWiz (ii, RegionData[R_TRANSn].CollProz) ;
 	    case e_tabn_reg_col :
-		PRD (RegionData[R_TABn].CollProz) ;
+		PrintWiz (ii, RegionData[R_TABn].CollProz) ;
 	    case e_rown_reg_col :
-		PRD (RegionData[R_ROWn].CollProz) ;
+		PrintWiz (ii, RegionData[R_ROWn].CollProz) ;
 
 	    case e_total_disp_calls :
-	        PRD ( pm*tct.total_disp_calls) ;
+	        PrintWiz (ii,  pm*tct.total_disp_calls) ;
 	    case e_total_commands :
-	        PRD ( pm*tct.total_commands) ;
+	        PrintWiz (ii,  pm*tct.total_commands) ;
             case e_total_prio :
-	        PRD ( pm*tct.total_prio) ;
+	        PrintWiz (ii,  pm*tct.total_prio) ;
 	    case e_total_prio_fom_oth :
-	        PRD ( pm*tct.total_prio_from_oth) ;
+	        PrintWiz (ii,  pm*tct.total_prio_from_oth) ;
 	    case e_total_prio_com_queue :
-	        PRD ( pm*tct.total_prio_com_queue) ;
+	        PrintWiz (ii,  pm*tct.total_prio_com_queue) ;
             case e_total_prio_rav_queue :
-	        PRD ( pm*tct.total_prio_rav_queue) ;
+	        PrintWiz (ii,  pm*tct.total_prio_rav_queue) ;
             case e_total_prio_commit :
-	        PRD ( pm*tct.total_prio_commit) ;
+	        PrintWiz (ii,  pm*tct.total_prio_commit) ;
 	    case e_total_reg_access :
-	        PRD ( pm*tct.total_reg_access) ;
+	        PrintWiz (ii,  pm*tct.total_reg_access) ;
             case e_begexcl_tas_coll :
-	        PRD ( pm*tct.begexcl_tas_coll) ;
+	        PrintWiz (ii,  pm*tct.begexcl_tas_coll) ;
 	    case e_total_reg_collision :
-	        PRD ( pm*tct.total_reg_collision) ;
+	        PrintWiz (ii,  pm*tct.total_reg_collision) ;
             case e_endexcl_tas_coll :
-	        PRD ( pm*tct.endexcl_tas_coll) ;
+	        PrintWiz (ii,  pm*tct.endexcl_tas_coll) ;
 	    case e_total_reg_wait:
-	        PRD ( pm*tct.total_reg_wait) ;
+	        PrintWiz (ii,  pm*tct.total_reg_wait) ;
             case e_total_state_vwait: 
-		PRD ( pm*tct.total_state_vwait ) ;
+		PrintWiz (ii,  pm*tct.total_state_vwait ) ;
 	    case e_total_state_vsuspend:
-		PRD ( pm*tct.total_state_vsuspend ) ;
+		PrintWiz (ii,  pm*tct.total_state_vsuspend ) ;
             case e_total_state_vsleep:
-		PRD ( pm*tct.total_state_vsleep ) ;
+		PrintWiz (ii,  pm*tct.total_state_vsleep ) ;
  
 	    default: 
 		fprintf (fo,"Unknown Type %d\n" , ii ) ;
@@ -1304,18 +1311,14 @@
     fprintf (fo,"\n") ;
 }
 
-static void PrintWizString ( i , v )
-int	i ;
-char	*v ;
+static void PrintWizString ( int i , char *v )
 {
     fprintf (fo,S[i].FDat , v ) ;
     if (R3)
 	fprintf (fo," ") ;
 }
 
-static void PrintWizNumeric ( i , v )
-int	i ;
-double	v ;
+static void PrintWizNumeric (int i , double v )
 {
     time_t  tt;
     char    ts [100] ;