From 6dfe077775f9f85754ae36e5f031ca6cc945c06d Mon Sep 17 00:00:00 2001 From: Devaev Maxim Date: Fri, 2 Apr 2021 12:38:38 +0300 Subject: [PATCH] refactoring --- python/ustreamer.c | 2 +- src/libs/memsink.c | 2 +- src/libs/memsinksh.h | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/python/ustreamer.c b/python/ustreamer.c index 0d5520b..a17129b 100644 --- a/python/ustreamer.c +++ b/python/ustreamer.c @@ -41,7 +41,7 @@ typedef struct { static void MemsinkObject_destroy_internals(MemsinkObject *self) { if (self->mem != NULL) { - munmap(self->mem, sizeof(memsink_shared_s)); + memsink_shared_unmap(self->mem); self->mem = NULL; } if (self->fd > 0) { diff --git a/src/libs/memsink.c b/src/libs/memsink.c index 3b6a5d2..a5db912 100644 --- a/src/libs/memsink.c +++ b/src/libs/memsink.c @@ -68,7 +68,7 @@ memsink_s *memsink_init( void memsink_destroy(memsink_s *sink) { if (sink->mem != MAP_FAILED) { - if (munmap(sink->mem, sizeof(memsink_shared_s)) < 0) { + if (memsink_shared_unmap(sink->mem) < 0) { LOG_PERROR("%s-sink: Can't unmap shared memory", sink->name); } } diff --git a/src/libs/memsinksh.h b/src/libs/memsinksh.h index 44b9f78..9ff9fb5 100644 --- a/src/libs/memsinksh.h +++ b/src/libs/memsinksh.h @@ -77,3 +77,8 @@ INLINE memsink_shared_s *memsink_shared_map(int fd) { assert(mem != NULL); return mem; } + +INLINE int memsink_shared_unmap(memsink_shared_s *mem) { + assert(mem != NULL); + return munmap(mem, sizeof(memsink_shared_s)); +}