Changeset 2371

Timestamp:

29/10/2008 20:57:33 (17 months ago)

Author:

chris

Message:

Use the same ostringstream formatting for protocol logging to file
that we use for standard logging, to fix 64bit platform warnings
reported by Matt Brown.

Files:

• box/trunk/lib/server/makeprotocol.pl.in (modified) (2 diffs)

box/trunk/lib/server/makeprotocol.pl.in

@@ -539 +539 @@
         if($implement_filelog)
         {
-                my ($format,$args) = make_log_strings($cmd);
+                my ($log) = make_log_strings_framework($cmd);
                 print CPP <<__E;
 void ${class}LogFile(const char *Action, FILE *File) const
 {
-        ::fprintf(File,"%s $format\\n",Action$args);
+        std::ostringstream oss;
+        oss << $log;
+        ::fprintf(File, "%s\\n", oss.str().c_str());
         ::fflush(File);
 }
@@ -1052 +1054 @@
                         $arg =~ s/VAR/m$nm/g;
 
-                        if ($format =~ m'x$')
-                        {
-                                $arg = "std::hex << std::showbase " .
-                                        "<< $arg << std::dec";
+                        if ($format eq '\\"%s\\"')
+                        {
+                                $arg = "\"\\\"\" << $arg << \"\\\"\"";
+                        }
+                        elsif ($format =~ m'x$')
+                        {
+                                # my $width = 0;
+                                # $ty =~ /^int(\d+)$/ and $width = $1 / 4;
+                                $arg =  "($arg == 0 ? \"0x\" : \"\") " .
+                                        "<< std::hex " .
+                                        "<< std::showbase " .
+                                        # "<< std::setw($width) " .
+                                        # "<< std::setfill('0') " .
+                                        # "<< std::internal " .
+                                        "<< $arg " .
+                                        "<< std::dec";
                         }