summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>2004-12-02 02:32:35 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>2004-12-02 02:32:35 +0000
commitbf0e95445873fe3043a07ed7575033ac300839da (patch)
tree4d109de2a2045ad37b29aa15800f4ea28b43ed78
parentfb2e7d1d61f904d19bfb0c24a8ab61ba7b820d13 (diff)
downloadATCD-bf0e95445873fe3043a07ed7575033ac300839da.tar.gz
ChangeLogTag:Wed Dec 1 15:01:39 2004 Steve Huston <shuston@riverace.com>
-rw-r--r--ChangeLog6
-rw-r--r--THANKS2
-rw-r--r--ace/Service_Config.cpp12
3 files changed, 10 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 612101e3000..56bfbd273d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -681,8 +681,10 @@ Thu Nov 18 07:38:34 2004 Chad Elliott <elliott_c@ociweb.com>
* ace/Service_Config.cpp:
- Distinguish between the existence of and the file permissions for
- the default service configurator file (svc.conf).
+ Distinguish between the existence of and the file permissions
+ for the default service configurator file (svc.conf). Thanks to
+ Dipa Suri <dipa.suri@lmco.com> and Adam Howell
+ <adam.s.howell@lmco.com> for reporting this.
Thu Nov 18 07:10:26 2004 Chad Elliott <elliott_c@ociweb.com>
diff --git a/THANKS b/THANKS
index c418087e17d..6c8390e728d 100644
--- a/THANKS
+++ b/THANKS
@@ -1929,6 +1929,8 @@ Chris Hammond <chrish at navsys dot com>
Vincent Spano <spam dot robot at go dot away>
Nuno Silva <Nuno dot Silva at edisoft dot pt>
Greg Bostrum <greg dot bostrom at hp dot com>
+Dipa Suri <dipa dot suri at lmco dot com>
+Adam Howell <adam dot s dot howell at lmco dot com>
I would particularly like to thank Paul Stephenson, who worked with me
at Ericsson in the early 1990's. Paul devised the recursive Makefile
diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp
index f3313e09799..e724c5d30fb 100644
--- a/ace/Service_Config.cpp
+++ b/ace/Service_Config.cpp
@@ -429,15 +429,11 @@ ACE_Service_Config::process_file (const ACE_TCHAR file[])
// because stat is better supported on most non-unix platforms.
ACE_stat exists;
if (ACE_OS::stat (file, &exists) == 0)
- {
- // If it exists, but we couldn't open it for reading then
- // we must not have permission to read it.
- errno = EPERM;
- }
+ // If it exists, but we couldn't open it for reading then we
+ // must not have permission to read it.
+ errno = EPERM;
else
- {
- errno = ENOENT;
- }
+ errno = ENOENT;
result = -1;
}
else