Dietmar: can you confirm this works for you?
Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com>
---
lib/ipc_shm.c | 6 +++---
lib/ringbuffer.c | 4 ++--
tests/resources.test | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/ipc_shm.c b/lib/ipc_shm.c
index 7ac73f9..d9112e2 100644
--- a/lib/ipc_shm.c
+++ b/lib/ipc_shm.c
@@ -234,9 +234,9 @@ static int32_t qb_ipcs_shm_connect(struct qb_ipcs_service *s,
qb_util_log(LOG_DEBUG, "connecting to client [%d]", c->pid);
- snprintf(r->request, NAME_MAX, "qb-%s-request-%d-%d", s->name,
c->pid, c->setup.u.us.sock);
- snprintf(r->response, NAME_MAX, "qb-%s-response-%d-%d", s->name,
c->pid, c->setup.u.us.sock);
- snprintf(r->event, NAME_MAX, "qb-%s-event-%d-%d", s->name, c->pid,
c->setup.u.us.sock);
+ snprintf(r->request, NAME_MAX, "%s-request-%d-%d", s->name, c->pid,
c->setup.u.us.sock);
+ snprintf(r->response, NAME_MAX, "%s-response-%d-%d", s->name, c->pid,
c->setup.u.us.sock);
+ snprintf(r->event, NAME_MAX, "%s-event-%d-%d", s->name, c->pid,
c->setup.u.us.sock);
c->request.u.shm.rb = qb_rb_open(r->request,
c->request.max_msg_size,
diff --git a/lib/ringbuffer.c b/lib/ringbuffer.c
index 8fa12b5..6f56e51 100644
--- a/lib/ringbuffer.c
+++ b/lib/ringbuffer.c
@@ -118,7 +118,7 @@ qb_rb_open(const char *name, size_t size, uint32_t flags,
/*
* Create a shared_hdr memory segment for the header.
*/
- snprintf(filename, PATH_MAX, "%s-header", name);
+ snprintf(filename, PATH_MAX, "qb-%s-header", name);
fd_hdr = qb_util_mmap_file_open(path, filename,
shared_size,
file_flags);
@@ -161,7 +161,7 @@ qb_rb_open(const char *name, size_t size, uint32_t flags,
* They have to be separate.
*/
if (flags & QB_RB_FLAG_CREATE) {
- snprintf(filename, PATH_MAX, "%s-data", name);
+ snprintf(filename, PATH_MAX, "qb-%s-data", name);
fd_data = qb_util_mmap_file_open(path,
filename,
real_size, file_flags);
diff --git a/tests/resources.test b/tests/resources.test
index 45e3ec0..0eadc4d 100755
--- a/tests/resources.test
+++ b/tests/resources.test
@@ -1,6 +1,6 @@
#!/bin/bash
RETURN=0
-ls /dev/shm/qb* 2>/dev/null
+ls /dev/shm/qb-test* 2>/dev/null
if [ $? -eq 0 ]
then
echo
--
1.7.5.2