Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Don't return positive status_t in Load() instead of B_OK.

Browse Source 
* Small coding style corrections.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35219 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2010-01-21 14:39:08 +00:00
parent 384ed4569c
commit 0ee4261ea8
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/preferences/keymap/Keymap.cpp
View File

@ -141,7 +141,7 @@ Keymap::Load(entry_ref &ref)
return B_BAD_VALUE; return B_BAD_VALUE;
} }
for (uint32 i=0; i<sizeof(fKeys)/4; i++) for (uint32 i = 0; i < sizeof(fKeys) / 4; i++)
((uint32*)&fKeys)[i] = B_BENDIAN_TO_HOST_INT32(((uint32*)&fKeys)[i]); ((uint32*)&fKeys)[i] = B_BENDIAN_TO_HOST_INT32(((uint32*)&fKeys)[i]);
if ((err = file.Read(&fCharsSize, sizeof(uint32))) < (ssize_t)sizeof(uint32)) { if ((err = file.Read(&fCharsSize, sizeof(uint32))) < (ssize_t)sizeof(uint32)) {
@ -154,19 +154,21 @@ Keymap::Load(entry_ref &ref)
fChars = new char[fCharsSize]; fChars = new char[fCharsSize];
err = file.Read(fChars, fCharsSize); ssize_t bytesRead = file.Read(fChars, fCharsSize);
if (err < B_OK) { if (bytesRead < 0) {
fprintf(stderr, "error reading keymap chars: %s\n", strerror(err)); fprintf(stderr, "error reading keymap chars: %s\n", strerror(err));
return (status_t)bytesRead;
} }
// fetch name from attribute and fall back to filename // fetch name from attribute and fall back to filename
ssize_t bytesRead
= file.ReadAttr("keymap:name", B_STRING_TYPE, 0, fName, sizeof(fName)); bytesRead = file.ReadAttr("keymap:name", B_STRING_TYPE, 0, fName,
sizeof(fName));
if (bytesRead > 0) if (bytesRead > 0)
fName[bytesRead] = '\0'; fName[bytesRead] = '\0';
else else
strlcpy(fName, ref.name, sizeof(fName)); strlcpy(fName, ref.name, sizeof(fName));
return err; return B_OK;
} }