diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-03-05 04:22:38 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-03-05 04:22:38 +0000 |
| commit | 57e3d1397223bba15e0bfd8d0045dc035e6b6fe8 (patch) | |
| tree | 5fd16b2da529a37b93794ddf52c6ef6da4304536 | |
| parent | 483be1f18490d1ba13c881930f2e6c7b410d7fa2 (diff) | |
| download | ATCD-57e3d1397223bba15e0bfd8d0045dc035e6b6fe8.tar.gz | |
ChangeLogTag:Sun Mar 04 20:15:33 2001 Ossama Othman <ossama@uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 15 | ||||
| -rw-r--r-- | TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp | 9 | ||||
| -rw-r--r-- | TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp | 11 | ||||
| -rw-r--r-- | TAO/examples/Content_Server/SMI_Iterator/client.cpp | 9 |
4 files changed, 25 insertions, 19 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 1b485a5cf46..b1ddb51d905 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,18 @@ +Sun Mar 04 20:15:33 2001 Ossama Othman <ossama@uci.edu> + + * examples/Content_Server/SMI_Iterator/client.cpp (retrieve_data): + * examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp + (initialize_content_iterator): + * examples/Content_Server/AMI_Observer/Callback_i.cpp + (Callback_i): + + Windows doesn't like the POSIX.1 mode constants I was using in + these files. Use the ACE_DEFAULT_FILE_PERMS macro instead to + work-around Windows-specific stuff like this. + + Fixed error messages so that they properly display filename with + which the error was associated. + Sun Mar 4 21:39:03 2001 Frank Hunleth <fhunleth@cs.wustl.edu> * tao/corbafwd.h: diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp index e46b83bff12..4892f086435 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp @@ -140,10 +140,9 @@ Iterator_Handler::initialize_content_iterator ACE_Addr::sap_any, 0, O_CREAT | O_TRUNC | O_WRONLY, - S_IRUSR | S_IWUSR) == -1) + ACE_DEFAULT_FILE_PERMS) == -1) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("Could not open file %s"), + ACE_TEXT ("Could not open file %p\n"), this->file_.get_path_name ())); else (*this->request_count_)++; @@ -263,9 +262,7 @@ Iterator_Handler::spawn_viewer (void) return 0; case ACE_INVALID_PID: ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("Error during viewer spawn of ") - ACE_TEXT ("\"%s\""), + ACE_TEXT ("Error during viewer spawn of %p\n"), opts.command_line_buf ()), -1); default: diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp index e2451c0ebbe..1c379a57417 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp @@ -29,11 +29,10 @@ Callback_i::Callback_i (int *request_count) ACE_Addr::sap_any, 0, O_CREAT | O_TRUNC | O_WRONLY, - S_IRUSR | S_IWUSR) == -1) + ACE_DEFAULT_FILE_PERMS) == -1) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("Could not open file %s"), + ACE_TEXT ("Could not open file \"%s\"%p\n"), this->file_.get_path_name ())); } else @@ -258,15 +257,13 @@ Callback_i::spawn_viewer (void) return 0; case ACE_INVALID_PID: ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("Error during viewer spawn of ") - ACE_TEXT ("\"%s\""), + ACE_TEXT ("Error during viewer spawn of %p\n"), opts.command_line_buf ()), -1); default: // Parent ACE_DEBUG ((LM_INFO, - "Spawned viewer <%s> with PID <%d>.\n", + ACE_TEXT ("Spawned viewer <%s> with PID <%d>.\n"), viewer, result)); break; diff --git a/TAO/examples/Content_Server/SMI_Iterator/client.cpp b/TAO/examples/Content_Server/SMI_Iterator/client.cpp index bad90986181..cf7d7f1159f 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/client.cpp +++ b/TAO/examples/Content_Server/SMI_Iterator/client.cpp @@ -165,11 +165,10 @@ int retrieve_data (const char *content_type, ACE_Addr::sap_any, 0, O_CREAT | O_TRUNC | O_WRONLY, - S_IRUSR | S_IWUSR) == -1) + ACE_DEFAULT_FILE_PERMS) == -1) { ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("Could not open file %s"), + ACE_TEXT ("Could not open file \"%s\"%p\n"), file_addr.get_path_name ())); } @@ -302,9 +301,7 @@ spawn_viewer (const char *content_type, return 0; case ACE_INVALID_PID: ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("Error during viewer spawn of ") - ACE_TEXT ("\"%s\""), + ACE_TEXT ("Error during viewer spawn of %p\n"), opts.command_line_buf ()), -1); default: |