diff options
| author | Bernard Normier <bernard@zeroc.com> | 2008-01-23 09:15:28 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2008-01-23 09:15:28 -0500 |
| commit | 2cdd39227e7efda5fc8b3a04a9c2b0d678943a17 (patch) | |
| tree | ac7d3ef0ae27a80cc2bc1f4a2c7f42c52d35e979 /cpp/src/IceGrid/ServerI.cpp | |
| parent | New VC60 third-party build + VC60 build fixes (diff) | |
| parent | - Added IceUtil::SyscallException and cleaned up few IceUtil exceptions (diff) | |
| download | ice-2cdd39227e7efda5fc8b3a04a9c2b0d678943a17.tar.bz2 ice-2cdd39227e7efda5fc8b3a04a9c2b0d678943a17.tar.xz ice-2cdd39227e7efda5fc8b3a04a9c2b0d678943a17.zip | |
Merge branch 'master' of ssh://cvs/home/git/ice
Diffstat (limited to 'cpp/src/IceGrid/ServerI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/ServerI.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index d4eacad1224..fd0c8065c2a 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -49,7 +49,7 @@ chownRecursive(const string& path, uid_t uid, gid_t gid) DIR* d; if((d = opendir(path.c_str())) == 0) { - throw "cannot read directory `" + path + "':\n" + IcePatch2::lastError(); + throw "cannot read directory `" + path + "':\n" + IceUtilInternal::lastErrorToString(); } struct dirent* entry; @@ -60,7 +60,7 @@ chownRecursive(const string& path, uid_t uid, gid_t gid) if(namelist == 0) { closedir(d); - throw "cannot read directory `" + path + "':\n" + IcePatch2::lastError(); + throw "cannot read directory `" + path + "':\n" + IceUtilInternal::lastErrorToString(); } size_t entrysize = sizeof(struct dirent) - sizeof(entry->d_name) + strlen(entry->d_name) + 1; @@ -68,7 +68,7 @@ chownRecursive(const string& path, uid_t uid, gid_t gid) if(namelist[n] == 0) { closedir(d); - throw "cannot read directory `" + path + "':\n" + IcePatch2::lastError(); + throw "cannot read directory `" + path + "':\n" + IceUtilInternal::lastErrorToString(); } memcpy(namelist[n], entry, entrysize); ++n; @@ -76,7 +76,7 @@ chownRecursive(const string& path, uid_t uid, gid_t gid) if(closedir(d)) { - throw "cannot read directory `" + path + "':\n" + IcePatch2::lastError(); + throw "cannot read directory `" + path + "':\n" + IceUtilInternal::lastErrorToString(); } for(int i = 0; i < n; ++i) @@ -90,13 +90,13 @@ chownRecursive(const string& path, uid_t uid, gid_t gid) name = path + "/" + name; if(chown(name.c_str(), uid, gid) != 0) { - throw "can't change permissions on `" + name + "':\n" + IcePatch2::lastError(); + throw "can't change permissions on `" + name + "':\n" + IceUtilInternal::lastErrorToString(); } OS::structstat buf; if(OS::osstat(name, &buf) == -1) { - throw "cannot stat `" + name + "':\n" + IcePatch2::lastError(); + throw "cannot stat `" + name + "':\n" + IceUtilInternal::lastErrorToString(); } if(S_ISDIR(buf.st_mode)) |