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

Added some NULL pointer checks

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2328 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Tyler Dauwalder
2002-12-31 07:28:44 +00:00
parent 0983fab3f8
commit 3ed1045364
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/disk_scanner/fs/bfs.c
+13 -7
View File
@@ -10,6 +10,7 @@
#include <disk_scanner/fs.h> #include <disk_scanner/fs.h>
#define BFS_FS_MODULE_NAME "disk_scanner/fs/bfs/v1" #define BFS_FS_MODULE_NAME "disk_scanner/fs/bfs/v1"
const char *kModuleDebugName = "fs/bfs";
//#define TRACE(x) //#define TRACE(x)
#define TRACE(x) dprintf x #define TRACE(x) dprintf x
@@ -127,7 +128,7 @@ static
status_t status_t
std_ops(int32 op, ...) std_ops(int32 op, ...)
{ {
TRACE(("fs/bfs: std_ops(0x%lx)\n", op)); TRACE(("%s: std_ops(0x%lx)\n", kModuleDebugName, op));
switch(op) { switch(op) {
case B_MODULE_INIT: case B_MODULE_INIT:
case B_MODULE_UNINIT: case B_MODULE_UNINIT:
@@ -162,6 +163,8 @@ read_block(int fd, off_t offset, size_t size, uchar **block)
/*! \brief Returns true if the given partition is a valid BFS partition. /*! \brief Returns true if the given partition is a valid BFS partition.
See fs_identify_hook() for more information. See fs_identify_hook() for more information.
\todo Fill in partitionInfo->mounted_at with something useful.
*/ */
static static
bool bool
@@ -169,8 +172,8 @@ bfs_fs_identify(int deviceFD, struct extended_partition_info *partitionInfo,
float *priority) float *priority)
{ {
bool result = false; bool result = false;
TRACE(("fs/bfs: identify(%d, %p, offset: %lld)\n", deviceFD, partitionInfo, TRACE(("%s: identify(%d, %p, offset: %lld)\n", kModuleDebugName, deviceFD,
partitionInfo ? partitionInfo->info.offset : -1)); partitionInfo, partitionInfo ? partitionInfo->info.offset : -1));
if (partitionInfo) { if (partitionInfo) {
uchar *buffer = NULL; uchar *buffer = NULL;
@@ -195,12 +198,15 @@ bfs_fs_identify(int deviceFD, struct extended_partition_info *partitionInfo,
{ {
result = false; result = false;
} else { } else {
strcpy(partitionInfo->file_system_short_name, "bfs"); if (partitionInfo->file_system_short_name)
strcpy(partitionInfo->file_system_long_name, "Be File System"); strcpy(partitionInfo->file_system_short_name, "bfs");
strcpy(partitionInfo->volume_name, superBlock->name); if (partitionInfo->file_system_long_name)
result = true; strcpy(partitionInfo->file_system_long_name, "Be File System");
if (partitionInfo->volume_name)
strcpy(partitionInfo->volume_name, superBlock->name);
if (priority) if (priority)
*priority = 0; *priority = 0;
result = true;
} }
free(buffer); free(buffer);
} }