--- a/src/common/packet-metadata.cc	Thu Aug 02 14:48:36 2007 +0100
+++ b/src/common/packet-metadata.cc	Thu Aug 02 14:56:04 2007 +0100
@@ -1377,13 +1377,13 @@
 {
   if (m_headerError)
     {
-      std::cout << "PacketMetadata header error. file=" << file 
+      Failure () << "PacketMetadata header error. file=" << file 
                 << ", line=" << line << std::endl;
       return false;
     }
   if (m_trailerError)
     {
-      std::cout << "PacketMetadata trailer error. file=" << file 
+      Failure () << "PacketMetadata trailer error. file=" << file 
                 << ", line=" << line << std::endl;
       return false;
     }
@@ -1403,20 +1403,20 @@
     }
   return true;
  error:
-  std::cout << "PacketMetadata error. file="<< file 
+  Failure () << "PacketMetadata error. file="<< file 
             << ", line=" << line << ", got:\"";
   for (std::list<int>::iterator i = m_prints.begin (); 
        i != m_prints.end (); i++)
     {
-      std::cout << *i << ", ";
+      Failure () << *i << ", ";
     }
-  std::cout << "\", expected: \"";
+  Failure () << "\", expected: \"";
   for (std::list<int>::iterator j = expected.begin ();
        j != expected.end (); j++)
     {
-      std::cout << *j << ", ";
+      Failure () << *j << ", ";
     }
-  std::cout << "\"" << std::endl;
+  Failure () << "\"" << std::endl;
   return false;
 }
 
@@ -1436,7 +1436,7 @@
   va_end (ap);
 
   m_printer.PrintForward ();
-  p.Print (std::cerr, m_printer);
+  p.Print (Failure (), m_printer);
   bool ok = Check (file, line, expected);
   CleanupPrints ();
   if (!ok)
@@ -1445,7 +1445,7 @@
     }
 
   m_printer.PrintBackward ();
-  p.Print (std::cerr, m_printer);
+  p.Print (Failure (), m_printer);
   expected.reverse ();
   ok = Check (file, line, expected);
   CleanupPrints ();