统一字符串有效性判断

This commit is contained in:
mutouyun 2023-09-24 16:52:48 +08:00 committed by 木头云
parent cf72d0293a
commit c74f78ea08
7 changed files with 10 additions and 9 deletions

View File

@ -45,7 +45,7 @@ namespace ipc {
namespace shm { namespace shm {
id_t acquire(char const * name, std::size_t size, unsigned mode) { id_t acquire(char const * name, std::size_t size, unsigned mode) {
if (name == nullptr || name[0] == '\0') { if (!is_valid_string(name)) {
ipc::error("fail acquire: name is empty\n"); ipc::error("fail acquire: name is empty\n");
return nullptr; return nullptr;
} }
@ -185,7 +185,7 @@ void remove(id_t id) {
} }
void remove(char const * name) { void remove(char const * name) {
if (name == nullptr || name[0] == '\0') { if (!is_valid_string(name)) {
ipc::error("fail remove: name is empty\n"); ipc::error("fail remove: name is empty\n");
return; return;
} }

View File

@ -28,7 +28,7 @@ namespace ipc {
namespace shm { namespace shm {
id_t acquire(char const * name, std::size_t size, unsigned mode) { id_t acquire(char const * name, std::size_t size, unsigned mode) {
if (name == nullptr || name[0] == '\0') { if (!is_valid_string(name)) {
ipc::error("fail acquire: name is empty\n"); ipc::error("fail acquire: name is empty\n");
return nullptr; return nullptr;
} }
@ -124,7 +124,7 @@ void remove(id_t id) {
} }
void remove(char const * name) { void remove(char const * name) {
if (name == nullptr || name[0] == '\0') { if (!is_valid_string(name)) {
ipc::error("fail remove: name is empty\n"); ipc::error("fail remove: name is empty\n");
return; return;
} }

View File

@ -18,6 +18,7 @@
#include "libipc/utility/log.h" #include "libipc/utility/log.h"
#include "libipc/platform/detail.h" #include "libipc/platform/detail.h"
#include "libipc/circ/elem_def.h" #include "libipc/circ/elem_def.h"
#include "libipc/memory/resource.h"
namespace ipc { namespace ipc {
namespace detail { namespace detail {
@ -29,7 +30,7 @@ protected:
template <typename Elems> template <typename Elems>
Elems* open(char const * name) { Elems* open(char const * name) {
if (name == nullptr || name[0] == '\0') { if (!is_valid_string(name)) {
ipc::error("fail open waiter: name is empty!\n"); ipc::error("fail open waiter: name is empty!\n");
return nullptr; return nullptr;
} }

View File

@ -69,7 +69,7 @@ void handle::sub_ref() noexcept {
} }
bool handle::acquire(char const * name, std::size_t size, unsigned mode) { bool handle::acquire(char const * name, std::size_t size, unsigned mode) {
if (name == nullptr || name[0] == '\0') { if (!is_valid_string(name)) {
ipc::error("fail acquire: name is empty\n"); ipc::error("fail acquire: name is empty\n");
return false; return false;
} }

View File

@ -50,7 +50,7 @@ bool condition::valid() const noexcept {
} }
bool condition::open(char const *name) noexcept { bool condition::open(char const *name) noexcept {
if (name == nullptr || name[0] == '\0') { if (!is_valid_string(name)) {
ipc::error("fail condition open: name is empty\n"); ipc::error("fail condition open: name is empty\n");
return false; return false;
} }

View File

@ -50,7 +50,7 @@ bool mutex::valid() const noexcept {
} }
bool mutex::open(char const *name) noexcept { bool mutex::open(char const *name) noexcept {
if (name == nullptr || name[0] == '\0') { if (!is_valid_string(name)) {
ipc::error("fail mutex open: name is empty\n"); ipc::error("fail mutex open: name is empty\n");
return false; return false;
} }

View File

@ -48,7 +48,7 @@ bool semaphore::valid() const noexcept {
} }
bool semaphore::open(char const *name, std::uint32_t count) noexcept { bool semaphore::open(char const *name, std::uint32_t count) noexcept {
if (name == nullptr || name[0] == '\0') { if (!is_valid_string(name)) {
ipc::error("fail semaphore open: name is empty\n"); ipc::error("fail semaphore open: name is empty\n");
return false; return false;
} }