From 10d0523409a858bc1abb7437c991f2f0ad1e3fca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Fri, 2 Jul 2010 08:10:38 +0000 Subject: [PATCH] * Removed questionable use of strlen(). git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37333 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/disk_systems/intel/ExtendedPartitionAddOn.cpp | 8 ++++---- src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/add-ons/disk_systems/intel/ExtendedPartitionAddOn.cpp b/src/add-ons/disk_systems/intel/ExtendedPartitionAddOn.cpp index eeceeabda3..fa85fbeb09 100644 --- a/src/add-ons/disk_systems/intel/ExtendedPartitionAddOn.cpp +++ b/src/add-ons/disk_systems/intel/ExtendedPartitionAddOn.cpp @@ -114,7 +114,7 @@ ExtendedPartitionAddOn::ValidateInitialize(const BMutablePartition* partition, BString* name, const char* parameters) { if (!CanInitialize(partition) - || (parameters != NULL && strlen(parameters) > 0)) { + || (parameters != NULL && parameters[0] != '\0')) { return B_BAD_VALUE; } @@ -132,8 +132,8 @@ ExtendedPartitionAddOn::Initialize(BMutablePartition* partition, const char* name, const char* parameters, BPartitionHandle** _handle) { if (!CanInitialize(partition) - || (name != NULL && strlen(name) > 0) - || (parameters != NULL && strlen(parameters) > 0)) { + || (name != NULL && name[0] != '\0') + || (parameters != NULL && parameters[0] != '\0')) { return B_BAD_VALUE; } @@ -448,7 +448,7 @@ ExtendedPartitionHandle::CreateChild(off_t offset, off_t size, return B_BAD_VALUE; // check name - if (name && strlen(name) > 0) + if (name != NULL && name[0] != '\0') return B_BAD_VALUE; // offset properly aligned? diff --git a/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp b/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp index 1d59c5cf3e..6731e8b183 100644 --- a/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp +++ b/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp @@ -114,7 +114,7 @@ PartitionMapAddOn::ValidateInitialize(const BMutablePartition* partition, BString* name, const char* parameters) { if (!CanInitialize(partition) - || (parameters != NULL && strlen(parameters) > 0)) { + || (parameters != NULL && parameters[0] != '\0')) { return B_BAD_VALUE; } @@ -132,8 +132,8 @@ PartitionMapAddOn::Initialize(BMutablePartition* partition, const char* name, const char* parameters, BPartitionHandle** _handle) { if (!CanInitialize(partition) - || (name != NULL && strlen(name) > 0) - || (parameters != NULL && strlen(parameters) > 0)) { + || (name != NULL && name[0] != '\0') + || (parameters != NULL && parameters[0] != '\0')) { return B_BAD_VALUE; }