diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2010-07-17 14:21:40 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2010-07-17 14:21:40 +0000 |
| commit | 7386598faf15e7292ebb4b9c3689c0c341159646 (patch) | |
| tree | a78665b333ebe5f4d99aa9540d38be0a767dae9b /TAO/tao/TAO_Internal.cpp | |
| parent | b7fcaff7698128ad2c3bdae24f119206d2510bcd (diff) | |
| download | ATCD-7386598faf15e7292ebb4b9c3689c0c341159646.tar.gz | |
Sat Jul 17 14:13:33 UTC 2010 Phil Mesnier <mesnier_p@ociweb.com>
* tao/TAO_Internal.cpp (ORB::open_services):
Silence compiler warnings
Diffstat (limited to 'TAO/tao/TAO_Internal.cpp')
| -rw-r--r-- | TAO/tao/TAO_Internal.cpp | 72 |
1 files changed, 39 insertions, 33 deletions
diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index b5d336c159b..5d39857ddbc 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -327,24 +327,26 @@ TAO::ORB::open_global_services (int argc, ACE_TCHAR **argv) // okay? if (status == -1) - if (errno != ENOENT) - { - if (TAO_debug_level > 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - Failed to open process-") - ACE_TEXT ("wide service configuration context\n"))); - } - - return -1; - } - else - { - if (TAO_debug_level > 4) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Did not find default svc.conf\n"))); - status = 0; - } + { + if (errno != ENOENT) + { + if (TAO_debug_level > 0) + { + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("TAO (%P|%t) - Failed to open process-") + ACE_TEXT ("wide service configuration context\n"))); + } + return -1; + } + else + { + if (TAO_debug_level > 4) + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("TAO (%P|%t) - Did not find default ") + ACE_TEXT ("svc.conf\n"))); + status = 0; + } + } if (status > 0) { @@ -489,21 +491,25 @@ TAO::ORB::open_services (ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> pcfg, } if (status == -1) - if (errno != ENOENT) - { - if (TAO_debug_level > 0) - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) - Failed to open ORB-specific ") - ACE_TEXT ("service configuration\n"))); - return -1; - } - else - { - if (TAO_debug_level > 4) - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%P|%t) - Did not find default svc.conf\n"))); - status = 0; - } + { + if (errno != ENOENT) + { + if (TAO_debug_level > 0) + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("TAO (%P|%t) - Failed to open ORB-specific ") + ACE_TEXT ("service configuration\n"))); + return -1; + } + else + { + if (TAO_debug_level > 4) + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("TAO (%P|%t) - Did not find default ") + ACE_TEXT ("svc.conf\n"))); + status = 0; + } + } + if (status > 0) { // one or more directives failed, but we don't know which |