From d3505a3818fa1a16904eb6f877872d377dd52671 Mon Sep 17 00:00:00 2001
From: Tommi Virtanen <tv@hq.newdream.net>
Date: Wed, 12 Jan 2011 10:24:08 -0800
Subject: [PATCH] Fix osdmaptool error reporting.

---
 src/osdmaptool.cc                           | 2 +-
 src/test/cli/osdmaptool/clobber.t           | 2 +-
 src/test/cli/osdmaptool/create-print.t      | 2 +-
 src/test/cli/osdmaptool/print-nonexistent.t | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/osdmaptool.cc b/src/osdmaptool.cc
index 61265827b048a..7e041fd650f14 100644
--- a/src/osdmaptool.cc
+++ b/src/osdmaptool.cc
@@ -126,7 +126,7 @@ int main(int argc, const char **argv)
       }
     }
     else {
-      cerr << me << ": couldn't open " << fn << ": " << cpp_strerror(r)
+      cerr << me << ": couldn't open " << fn << ": " << cpp_strerror(-r)
 	   << std::endl;
       return -1;
     }
diff --git a/src/test/cli/osdmaptool/clobber.t b/src/test/cli/osdmaptool/clobber.t
index f08da2db44702..b045725e6fada 100644
--- a/src/test/cli/osdmaptool/clobber.t
+++ b/src/test/cli/osdmaptool/clobber.t
@@ -2,7 +2,7 @@
   $ osdmaptool --createsimple 3 myosdmap
   osdmaptool: osdmap file 'myosdmap'
   \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{12} can't open myosdmap: error 2: No such file or directory (re)
-  osdmaptool: couldn't open myosdmap: error -2: Unknown error 18446744073709551614
+  osdmaptool: couldn't open myosdmap: error 2: No such file or directory
   [255]
 
   $ osdmaptool --createsimple 3 --clobber myosdmap
diff --git a/src/test/cli/osdmaptool/create-print.t b/src/test/cli/osdmaptool/create-print.t
index 1ff681e90922c..c4879515d45bc 100644
--- a/src/test/cli/osdmaptool/create-print.t
+++ b/src/test/cli/osdmaptool/create-print.t
@@ -2,7 +2,7 @@
   $ osdmaptool --createsimple 3 myosdmap
   osdmaptool: osdmap file 'myosdmap'
   \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{12} can't open myosdmap: error 2: No such file or directory (re)
-  osdmaptool: couldn't open myosdmap: error -2: Unknown error 18446744073709551614
+  osdmaptool: couldn't open myosdmap: error 2: No such file or directory
   [255]
 
   $ osdmaptool --createsimple 3 --clobber myosdmap
diff --git a/src/test/cli/osdmaptool/print-nonexistent.t b/src/test/cli/osdmaptool/print-nonexistent.t
index 6a6411d26ac87..bbbe3b93891fd 100644
--- a/src/test/cli/osdmaptool/print-nonexistent.t
+++ b/src/test/cli/osdmaptool/print-nonexistent.t
@@ -1,5 +1,5 @@
   $ osdmaptool --print nonexistent
   osdmaptool: osdmap file 'nonexistent'
   \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{12} can't open nonexistent: error 2: No such file or directory (re)
-  osdmaptool: couldn't open nonexistent: error -2: Unknown error 18446744073709551614
+  osdmaptool: couldn't open nonexistent: error 2: No such file or directory
   [255]
-- 
2.39.5