Moved the error logging to the open_i call where the error is detected, this simplifies the calling code a lot.

We don't check for ENOENT anymore as error, an unresolved symbol causes also ENOENT and we want to get that error back to the caller. As side effect any loading of the implied dll names (different prefix/extensions) also trigger an error log but at the moment one succeeds the caller shouldn't check the error stack

    * ACE/ace/DLL.cpp:
    * ACE/ace/DLL_Manager.cpp:
    * ACE/ace/DLL_Manager.h:

1 files changed, 4 insertions, 10 deletions

diff --git a/ACE/ace/DLL_Manager.h b/ACE/ace/DLL_Manager.h
index 6c17ee7572c..66ca5f09911 100644
--- a/ACE/ace/DLL_Manager.h
+++ b/ACE/ace/DLL_Manager.h
@@ -54,7 +54,7 @@ class ACE_Export ACE_DLL_Handle
 {
 public:
   /// Error stack. Fixed size should suffice. Ignores any errors exceeding the size.
-  typedef ACE_Fixed_Stack < ACE_TString, 10 >  ERROR_STACK;
+  typedef ACE_Fixed_Stack <ACE_TString, 10> ERROR_STACK;
 
   /// Default construtor.
   ACE_DLL_Handle (void);
@@ -164,18 +164,12 @@ private:
    *            @a dll_name is first loaded
    *        @li @c RTLD_GLOBAL: makes symbols available for relocation
    *            processing of any other DLLs.
-   * @retval false On failure
-   * @retval true On success.
-   */
-  bool open_i (const ACE_TCHAR *dll_name, int open_mode);
-
-  /**
-   * This method logs error of opening the DLL.
-   * @param dll_name  The filename or path of the DLL to load.
    * @param errors Optional address of an error stack to collect any errors
    *        encountered.
+   * @retval false On failure
+   * @retval true On success
    */
-  void log_error (const ACE_TCHAR *dll_name, ERROR_STACK *errors);
+  bool open_i (const ACE_TCHAR *dll_name, int open_mode, ERROR_STACK* errors);
 
   /// Disallow copying and assignment since we don't handle them.
   ACE_DLL_Handle (const ACE_DLL_Handle &);