Imported from /home/lorry/working-area/delta_VirtualBox/VirtualBox-4.3.10.tar.bz2.HEADVirtualBox-4.3.10master

7 files changed, 15 insertions, 32 deletions

diff --git a/src/VBox/Runtime/common/err/RTErrConvertFromErrno.cpp b/src/VBox/Runtime/common/err/RTErrConvertFromErrno.cpp
index a60da983..f079f064 100644
--- a/src/VBox/Runtime/common/err/RTErrConvertFromErrno.cpp
+++ b/src/VBox/Runtime/common/err/RTErrConvertFromErrno.cpp
@@ -430,7 +430,9 @@ RTDECL(int)  RTErrConvertFromErrno(unsigned uNativeCode)
         case EPROCLIM:          return VERR_MAX_PROCS_REACHED;
 #endif
 #ifdef EDOOFUS
+# if EDOOFUS != EINVAL
         case EDOOFUS:           return VERR_INTERNAL_ERROR;
+# endif
 #endif
 #ifdef ENOTSUP
 # ifndef EOPNOTSUPP
diff --git a/src/VBox/Runtime/common/err/RTErrConvertToErrno.cpp b/src/VBox/Runtime/common/err/RTErrConvertToErrno.cpp
index 6371f0a6..0e90b202 100644
--- a/src/VBox/Runtime/common/err/RTErrConvertToErrno.cpp
+++ b/src/VBox/Runtime/common/err/RTErrConvertToErrno.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2007-2009 Oracle Corporation
+ * Copyright (C) 2007-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/err/errinfo.cpp b/src/VBox/Runtime/common/err/errinfo.cpp
index 7b43ee85..4d50db5f 100644
--- a/src/VBox/Runtime/common/err/errinfo.cpp
+++ b/src/VBox/Runtime/common/err/errinfo.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/err/errmsg.cpp b/src/VBox/Runtime/common/err/errmsg.cpp
index b5d223c6..31cd4370 100644
--- a/src/VBox/Runtime/common/err/errmsg.cpp
+++ b/src/VBox/Runtime/common/err/errmsg.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/err/errmsg.sed b/src/VBox/Runtime/common/err/errmsg.sed
index 5dc80e9c..2ccc7be0 100644
--- a/src/VBox/Runtime/common/err/errmsg.sed
+++ b/src/VBox/Runtime/common/err/errmsg.sed
@@ -49,33 +49,14 @@ b end
 ##
 # Convert descriptive comments. /** desc */
 :description
-# arg! how to do N until end of comment?
-/\*\//!N
-/\*\//!N
-/\*\//!N
-/\*\//!N
-/\*\//!N
-/\*\//!N
-/\*\//!N
-/\*\//!N
-/\*\//!N
-/\*\//!N
-/\*\//!N
-/\*\//!N
-/\*\//!N
-/\*\//!N
-/\*\//!N
-/\*\//!N
-/\*\//!N
-/\*\//!N
-/\*\//!N
-/\*\//!N
-/\*\//!N
-/\*\//!N
-/\*\//!N
-/\*\//!N
-/\*\//!N
-/\*\//!N
+
+# Read all the lines belonging to the comment into the buffer.
+:look-for-end-of-comment
+/\*\//bend-of-comment
+N
+blook-for-end-of-comment
+:end-of-comment
+
 # anything with @{ and @} is skipped
 /@[\{\}]/d
 
diff --git a/src/VBox/Runtime/common/err/errmsgcom.sed b/src/VBox/Runtime/common/err/errmsgcom.sed
index b101ad7c..bd47a60d 100644
--- a/src/VBox/Runtime/common/err/errmsgcom.sed
+++ b/src/VBox/Runtime/common/err/errmsgcom.sed
@@ -3,7 +3,7 @@
 # IPRT - SED script for converting COM errors
 #
 
-# Copyright (C) 2006-2009 Oracle Corporation
+# Copyright (C) 2006-2010 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Runtime/common/err/errmsgxpcom.cpp b/src/VBox/Runtime/common/err/errmsgxpcom.cpp
index 74071989..8d9903f0 100644
--- a/src/VBox/Runtime/common/err/errmsgxpcom.cpp
+++ b/src/VBox/Runtime/common/err/errmsgxpcom.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2008 Oracle Corporation
+ * Copyright (C) 2006-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;