i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed warnings.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25289 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2008-05-02 12:39:17 +00:00
parent 6f57d9d066
commit 2239c25b29
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/libroot/os/find_directory.c
+6 -6
View File
@@ -280,10 +280,6 @@ find_directory(directory_which which, dev_t device, bool createIt,
err = B_OK; err = B_OK;
if (template) { if (template) {
if (!strncmp(template, "$h", 2)) { if (!strncmp(template, "$h", 2)) {
struct passwd pwBuffer;
char pwStringBuffer[MAX_PASSWD_BUFFER_SIZE];
struct passwd *pw;
if (bootDevice > -1 && device != bootDevice) { if (bootDevice > -1 && device != bootDevice) {
int l = pathLength - strlen(buffer); int l = pathLength - strlen(buffer);
if (l > 5) if (l > 5)
@@ -291,6 +287,10 @@ find_directory(directory_which which, dev_t device, bool createIt,
} else { } else {
#ifndef _KERNEL_MODE #ifndef _KERNEL_MODE
#ifdef USE_PWENTS #ifdef USE_PWENTS
struct passwd pwBuffer;
char pwStringBuffer[MAX_PASSWD_BUFFER_SIZE];
struct passwd *pw;
if (getpwuid_r(geteuid(), &pwBuffer, pwStringBuffer, if (getpwuid_r(geteuid(), &pwBuffer, pwStringBuffer,
sizeof(pwStringBuffer), &pw) == 0) { sizeof(pwStringBuffer), &pw) == 0) {
home = pw->pw_dir; home = pw->pw_dir;
@@ -309,9 +309,9 @@ find_directory(directory_which which, dev_t device, bool createIt,
} else } else
strlcat(buffer, "/", pathLength); strlcat(buffer, "/", pathLength);
if (!err && strlen(buffer) + 2 + strlen(template) < (uint32)pathLength) { if (!err && strlen(buffer) + 2 + strlen(template) < (uint32)pathLength)
strcat(buffer, template); strcat(buffer, template);
} else else
err = err ? err : E2BIG; err = err ? err : E2BIG;
} else } else
err = err ? err : ENOENT; err = err ? err : ENOENT;