Skip to content

Commit c74f78e

Browse files
committed
统一字符串有效性判断
1 parent cf72d02 commit c74f78e

File tree

7 files changed

+10
-9
lines changed

7 files changed

+10
-9
lines changed

src/libipc/platform/posix/shm_posix.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ namespace ipc {
4545
namespace shm {
4646

4747
id_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

187187
void 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
}

src/libipc/platform/win/shm_win.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace ipc {
2828
namespace shm {
2929

3030
id_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

126126
void 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
}

src/libipc/queue.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
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

2223
namespace ipc {
2324
namespace 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
}

src/libipc/shm.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ void handle::sub_ref() noexcept {
6969
}
7070

7171
bool 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
}

src/libipc/sync/condition.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ bool condition::valid() const noexcept {
5050
}
5151

5252
bool 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
}

src/libipc/sync/mutex.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ bool mutex::valid() const noexcept {
5050
}
5151

5252
bool 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
}

src/libipc/sync/semaphore.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ bool semaphore::valid() const noexcept {
4848
}
4949

5050
bool 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
}

0 commit comments

Comments
 (0)