Fix bug introduced by r23463. We now handle positive

error codes correctly again.  Also fix a typo.
Reviewed by Jeff Squyres. 

This commit was SVN r23531.

The following SVN revision numbers were found above:
  r23463 --> open-mpi/ompi@2af3e6e5ae

ompi/errhandler/errcode-internal.h

@@ -11,6 +11,7 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2010      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2010      Oracle and/or its affiliates.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -59,7 +60,7 @@ static inline int ompi_errcode_get_mpi_code(int errcode)
     int i;
     ompi_errcode_intern_t *errc;
 
-    /* Transmorgify, if necessary */
+    /* Transmogrify, if necessary */
     errcode = OPAL_SOS_GET_ERROR_CODE(errcode);
 
     /* If the errcode is >= 0, then it's already an MPI error code, so

opal/util/opal_sos.h

@@ -10,6 +10,7 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2010      Oracle and/or its affiliates.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -165,7 +166,8 @@
  * Returns the native error code for the given encoded error code \c
  * errnum. \c errnum can be a native error code itself.
  */
-#define OPAL_SOS_GET_ERROR_CODE(errnum) ((int) -(-errnum & 0x3FFL))
+#define OPAL_SOS_GET_ERROR_CODE(errnum)                                 \
+    ((errnum >= 0) ? errnum : (int) -(-errnum & 0x3FFL))
 
 /**
  * Sets the native error code for the potentially encoded error code.