--- sys/src/in/hin97.h	Wed Jul 31 13:56:43 2002
+++ sys/src/in/hin97.h	Thu Aug  1 14:47:08 2002
@@ -55,7 +55,7 @@
     virtual void procReturns (const char * fmt, ...);
     virtual void procExit (const char * name);
     virtual void writeln (const char * name, int len = -1);
-    virtual void printf (const char * format, ...);
+    virtual void xprintf (const char * format, ...);
     virtual void vprintf (const char * format, va_list ap);
     virtual void setIndentation (int newIndent);
     virtual void hex (const char * comment, const void * buf, int len);
--- sys/src/in/vin201.cpp	Wed Jul 31 13:56:45 2002
+++ sys/src/in/vin201.cpp	Thu Aug  1 14:47:08 2002
@@ -450,7 +450,7 @@
   /*
   * dump header
   */
-  trace->printf ("        %s Part %d Arguments (%d of %d bytes) (Segment at %d)\n",
+  trace->xprintf ("        %s Part %d Arguments (%d of %d bytes) (Segment at %d)\n",
     dumpInfo->name, header->sp1p_arg_count, header->sp1p_buf_len,
     header->sp1p_buf_size, header->sp1p_segm_offset);
     /*
--- sys/src/in/vin203.cpp	Wed Jul 31 13:56:45 2002
+++ sys/src/in/vin203.cpp	Thu Aug  1 14:47:08 2002
@@ -87,13 +87,13 @@
     if (!this->IsValid ()) {
         trace->writeln ("Invalid Packet");
     }
-    trace->printf ("<Packet> %s  %s swap  %.3s-%.5s (transfer len %d)\n",
+    trace->xprintf ("<Packet> %s  %s swap  %.3s-%.5s (transfer len %d)\n",
         in97EnumDump (&messCodeDesc, header->sp1h_mess_code, tmpBuf [0]),
         in97EnumDump (&swapTypeDesc, header->sp1h_mess_swap, tmpBuf [1]),
         header->sp1h_application.asCharp (),
         header->sp1h_appl_version.asCharp (),
         this->Length ());
-    trace->printf ("    %3d Segment(s) (%d of %d bytes)\n",
+    trace->xprintf ("    %3d Segment(s) (%d of %d bytes)\n",
         header->sp1h_no_of_segm, header->sp1h_varpart_len,
         header->sp1h_varpart_size);
 
--- sys/src/in/vin97.cpp	Wed Jul 31 13:56:49 2002
+++ sys/src/in/vin97.cpp	Thu Aug  1 14:47:08 2002
@@ -102,7 +102,7 @@
 
 void cin97_TraceStream::procEntry (const char * name)
 {
-    this->printf ("%*s-->%s\n", this->nesting * this->indent, "", name);
+    this->xprintf ("%*s-->%s\n", this->nesting * this->indent, "", name);
     ++this->nesting;
 }
 
@@ -138,7 +138,7 @@
 void cin97_TraceStream::procExit (const char * name)
 {
     --this->nesting;
-    this->printf ("%*s<--%s\n", this->nesting * this->indent, "", name);
+    this->xprintf ("%*s<--%s\n", this->nesting * this->indent, "", name);
 }
 
 /*----------------------------------------*/
@@ -150,7 +150,7 @@
 
 /*----------------------------------------*/
 
-void cin97_TraceStream::printf (const char * format, ...)
+void cin97_TraceStream::xprintf (const char * format, ...)
 {
     va_list         ap;
 
--- sys/src/in/vin202.cpp.orig	Mon Jun  3 13:30:30 2002
+++ sys/src/in/vin202.cpp	Tue Sep  3 17:02:21 2002
@@ -180,17 +180,17 @@
     tsp1_segment_header * header = &this->rawSegment->sp1s_segm_header ();
     char tmpBuf [tmpBufSize_cin97] [3];
 
-    trace->printf ("   %s Segment %d at %d (%d of %d bytes)\n",
+    trace->xprintf ("   %s Segment %d at %d (%d of %d bytes)\n",
         in97EnumDump (&segmKindDesc, header->sp1s_segm_kind (), tmpBuf [0]),
         header->sp1s_own_index (), header->sp1s_segm_offset (),
         header->sp1s_segm_len (), this->Size ());
     switch (sp1sk_cmd) {
         case sp1sk_cmd:
-            trace->printf ("        messtype: %s  sqlmode: %s  producer: %s\n",
+            trace->xprintf ("        messtype: %s  sqlmode: %s  producer: %s\n",
                 in97EnumDump (&messtypeDesc, header->sp1c_mess_type (), tmpBuf [0]),
                 in97EnumDump (&sqlModeDesc, header->sp1c_sqlmode (), tmpBuf [1]),
                 in97EnumDump (&producerDesc, header->sp1c_producer (), tmpBuf [2]));
-            trace->printf ("        Options: %s%s%s%s%s%s\n",
+            trace->xprintf ("        Options: %s%s%s%s%s%s\n",
                 header->sp1c_commit_immediately () ? "commit " : "",
                 header->sp1c_ignore_costwarning () ? "ignore costwarning " : "",
                 header->sp1c_prepare () ? "prepare " : "",
@@ -199,15 +199,15 @@
                 header->sp1c_parsing_again () ? "parsing again " : "");
             break;
         case sp1sk_return:
-            trace->printf ("        RC: %d  %.5s  (Pos %d) Function %d\n",
-                header->sp1r_returncode (), header->sp1r_sqlstate (),
-                header->sp1r_errorpos (), header->sp1r_function_code ());
+            trace->xprintf ("        RC: %d  %.5s  (Pos %d) Function %d\n",
+                (int)header->sp1r_returncode (), (char*)header->sp1r_sqlstate (),
+                (int)header->sp1r_errorpos (), (int)header->sp1r_function_code ());
             break;
         default:
             trace->writeln ("unknown segement kind");
             break;
     }
-    trace->printf ("        %d parts:\n", header->sp1s_no_of_parts ());
+    trace->xprintf ("        %d parts:\n", header->sp1s_no_of_parts ());
 
     cin202_ReplySegment tmpSegment (this->rawSegment);
     cin201_Part part = tmpSegment.GetFirstPart ();