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

boot/loader: Fix -Wformat-security

Browse Source 
Change-Id: I760d2c7a99f0d20ae6d81c09f9ba786013c405d6
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3354
Reviewed-by: Jérôme Duval <[email protected]>
This commit is contained in:
Murai Takashi
2020-10-28 16:25:26 +00:00
committed by Jérôme Duval
parent 4f819c8959
commit ef2e30aaca
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/loader/FileMapDisk.cpp
+10 -10
View File
@@ -69,7 +69,7 @@ status_t
FileMapDisk::Open(void **_cookie, int mode) FileMapDisk::Open(void **_cookie, int mode)
{ {
TRACE(("FileMapDisk::Open(, 0x%08x)\n", mode)); TRACE(("FileMapDisk::Open(, 0x%08x)\n", mode));
if (!fNode) if (fNode == NULL)
return B_NO_INIT; return B_NO_INIT;
return fNode->Open(_cookie, mode); return fNode->Open(_cookie, mode);
@@ -80,7 +80,7 @@ status_t
FileMapDisk::Close(void *cookie) FileMapDisk::Close(void *cookie)
{ {
TRACE(("FileMapDisk::Close(%p)\n", cookie)); TRACE(("FileMapDisk::Close(%p)\n", cookie));
if (!fNode) if (fNode == NULL)
return B_NO_INIT; return B_NO_INIT;
return fNode->Close(cookie); return fNode->Close(cookie);
@@ -93,7 +93,7 @@ FileMapDisk::ReadAt(void *cookie, off_t pos, void *_buffer,
size_t bufferSize) size_t bufferSize)
{ {
TRACE(("FileMapDisk::ReadAt(%p, %lld, , %ld)\n", cookie, pos, bufferSize)); TRACE(("FileMapDisk::ReadAt(%p, %lld, , %ld)\n", cookie, pos, bufferSize));
if (!fNode) if (fNode == NULL)
return B_NO_INIT; return B_NO_INIT;
return fNode->ReadAt(cookie, pos, _buffer, bufferSize); return fNode->ReadAt(cookie, pos, _buffer, bufferSize);
@@ -114,10 +114,10 @@ status_t
FileMapDisk::GetName(char *nameBuffer, size_t bufferSize) const FileMapDisk::GetName(char *nameBuffer, size_t bufferSize) const
{ {
const char *prefix = "FileMapDisk:"; const char *prefix = "FileMapDisk:";
if (!nameBuffer) if (nameBuffer == NULL)
return B_BAD_VALUE; return B_BAD_VALUE;
snprintf(nameBuffer, bufferSize, prefix); strlcpy(nameBuffer, prefix, bufferSize);
if (bufferSize > strlen(prefix) && fNode) if (bufferSize > strlen(prefix) && fNode)
return fNode->GetName(nameBuffer + strlen(prefix), return fNode->GetName(nameBuffer + strlen(prefix),
bufferSize - strlen(prefix)); bufferSize - strlen(prefix));
@@ -136,7 +136,7 @@ FileMapDisk::GetFileMap(struct file_map_run *runs, int32 *count)
off_t off_t
FileMapDisk::Size() const FileMapDisk::Size() const
{ {
if (!fNode) if (fNode == NULL)
return B_NO_INIT; return B_NO_INIT;
return fNode->Size(); return fNode->Size();
} }
@@ -149,23 +149,23 @@ FileMapDisk::FindAnyFileMapDisk(Directory *volume)
Node *node; Node *node;
status_t error; status_t error;
if (!volume) if (volume == NULL)
return NULL; return NULL;
//XXX: check lower/mixed case as well //XXX: check lower/mixed case as well
Node *dirnode; Node *dirnode;
Directory *dir; Directory *dir;
dirnode = volume->Lookup(FMAP_FOLDER_NAME, true); dirnode = volume->Lookup(FMAP_FOLDER_NAME, true);
if (!dirnode || !S_ISDIR(dirnode->Type())) if (dirnode == NULL || !S_ISDIR(dirnode->Type()))
return NULL; return NULL;
dir = (Directory *)dirnode; dir = (Directory *)dirnode;
node = dir->Lookup(FMAP_IMAGE_NAME, true); node = dir->Lookup(FMAP_IMAGE_NAME, true);
if (!node) if (node == NULL)
return NULL; return NULL;
// create a FileMapDisk object // create a FileMapDisk object
FileMapDisk *disk = new(nothrow) FileMapDisk; FileMapDisk *disk = new(nothrow) FileMapDisk;
if (disk) { if (disk != NULL) {
error = disk->Init(node); error = disk->Init(node);
if (error != B_OK) { if (error != B_OK) {
delete disk; delete disk;