File tree Expand file tree Collapse file tree 7 files changed +10
-9
lines changed Expand file tree Collapse file tree 7 files changed +10
-9
lines changed Original file line number Diff line number Diff line change @@ -45,7 +45,7 @@ namespace ipc {
4545namespace shm {
4646
4747id_t acquire (char const * name, std::size_t size, unsigned mode) {
48- if (name == nullptr || name[ 0 ] == ' \0 ' ) {
48+ if (! is_valid_string ( name) ) {
4949 ipc::error (" fail acquire: name is empty\n " );
5050 return nullptr ;
5151 }
@@ -185,7 +185,7 @@ void remove(id_t id) {
185185}
186186
187187void remove (char const * name) {
188- if (name == nullptr || name[ 0 ] == ' \0 ' ) {
188+ if (! is_valid_string ( name) ) {
189189 ipc::error (" fail remove: name is empty\n " );
190190 return ;
191191 }
Original file line number Diff line number Diff line change @@ -28,7 +28,7 @@ namespace ipc {
2828namespace shm {
2929
3030id_t acquire (char const * name, std::size_t size, unsigned mode) {
31- if (name == nullptr || name[ 0 ] == ' \0 ' ) {
31+ if (! is_valid_string ( name) ) {
3232 ipc::error (" fail acquire: name is empty\n " );
3333 return nullptr ;
3434 }
@@ -124,7 +124,7 @@ void remove(id_t id) {
124124}
125125
126126void remove (char const * name) {
127- if (name == nullptr || name[ 0 ] == ' \0 ' ) {
127+ if (! is_valid_string ( name) ) {
128128 ipc::error (" fail remove: name is empty\n " );
129129 return ;
130130 }
Original file line number Diff line number Diff line change 1818#include " libipc/utility/log.h"
1919#include " libipc/platform/detail.h"
2020#include " libipc/circ/elem_def.h"
21+ #include " libipc/memory/resource.h"
2122
2223namespace ipc {
2324namespace detail {
@@ -29,7 +30,7 @@ class queue_conn {
2930
3031 template <typename Elems>
3132 Elems* open (char const * name) {
32- if (name == nullptr || name[ 0 ] == ' \0 ' ) {
33+ if (! is_valid_string ( name) ) {
3334 ipc::error (" fail open waiter: name is empty!\n " );
3435 return nullptr ;
3536 }
Original file line number Diff line number Diff line change @@ -69,7 +69,7 @@ void handle::sub_ref() noexcept {
6969}
7070
7171bool handle::acquire (char const * name, std::size_t size, unsigned mode) {
72- if (name == nullptr || name[ 0 ] == ' \0 ' ) {
72+ if (! is_valid_string ( name) ) {
7373 ipc::error (" fail acquire: name is empty\n " );
7474 return false ;
7575 }
Original file line number Diff line number Diff line change @@ -50,7 +50,7 @@ bool condition::valid() const noexcept {
5050}
5151
5252bool condition::open (char const *name) noexcept {
53- if (name == nullptr || name[ 0 ] == ' \0 ' ) {
53+ if (! is_valid_string ( name) ) {
5454 ipc::error (" fail condition open: name is empty\n " );
5555 return false ;
5656 }
Original file line number Diff line number Diff line change @@ -50,7 +50,7 @@ bool mutex::valid() const noexcept {
5050}
5151
5252bool mutex::open (char const *name) noexcept {
53- if (name == nullptr || name[ 0 ] == ' \0 ' ) {
53+ if (! is_valid_string ( name) ) {
5454 ipc::error (" fail mutex open: name is empty\n " );
5555 return false ;
5656 }
Original file line number Diff line number Diff line change @@ -48,7 +48,7 @@ bool semaphore::valid() const noexcept {
4848}
4949
5050bool semaphore::open (char const *name, std::uint32_t count) noexcept {
51- if (name == nullptr || name[ 0 ] == ' \0 ' ) {
51+ if (! is_valid_string ( name) ) {
5252 ipc::error (" fail semaphore open: name is empty\n " );
5353 return false ;
5454 }
You can’t perform that action at this time.
0 commit comments