Split wob_create_argb_buffer() into wob_shm_create() & wob_shm_alloc()

Author: francma

buffer.c

@@ -9,44 +9,47 @@
 
 #include "buffer.h"
 
-bool
-wob_create_argb_buffer(const size_t size, int *shmid, uint32_t **buffer)
+int
+wob_shm_create()
 {
-	int shmid_local = -1;
+	int shmid = -1;
 	char shm_name[NAME_MAX];
 	for (unsigned char i = 0; i < UCHAR_MAX; ++i) {
 		if (snprintf(shm_name, NAME_MAX, "/wob-%hhu", i) >= NAME_MAX) {
 			break;
 		}
-		shmid_local = shm_open(shm_name, O_RDWR | O_CREAT | O_EXCL, 0600);
-		if (shmid_local > 0 || errno != EEXIST) {
+		shmid = shm_open(shm_name, O_RDWR | O_CREAT | O_EXCL, 0600);
+		if (shmid > 0 || errno != EEXIST) {
 			break;
 		}
 	}
 
-	if (shmid_local < 0) {
+	if (shmid < 0) {
 		perror("shm_open");
-		return false;
+		return -1;
 	}
 
 	if (shm_unlink(shm_name) != 0) {
 		perror("shm_unlink");
-		return false;
+		return -1;
 	}
 
-	if (ftruncate(shmid_local, size) != 0) {
+	return shmid;
+}
+
+void *
+wob_shm_alloc(const int shmid, const size_t size)
+{
+	if (ftruncate(shmid, size) != 0) {
 		perror("ftruncate");
-		return false;
+		return NULL;
 	}
 
-	void *buffer_local = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, shmid_local, 0);
-	if (buffer_local == MAP_FAILED) {
+	void *buffer = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, shmid, 0);
+	if (buffer == MAP_FAILED) {
 		perror("mmap");
-		return false;
+		return NULL;
 	}
 
-	*buffer = (uint32_t *) buffer_local;
-	*shmid = shmid_local;
-
-	return true;
+	return buffer;
 }

include/buffer.h

@@ -4,6 +4,8 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-bool wob_create_argb_buffer(const size_t size, int *shmid, uint32_t **buffer);
+int wob_shm_create();
+
+void *wob_shm_alloc(int shmid, size_t size);
 
 #endif

main.c

@@ -487,8 +487,14 @@ main(int argc, char **argv)
 	geom.size = geom.stride * geom.height;
 	app.wob_geom = &geom;
 
-	uint32_t *argb = NULL;
-	if (!wob_create_argb_buffer(app.wob_geom->size, &(app.shmid), &argb)) {
+	int shmid = wob_shm_create();
+	if (shmid < 0) {
+		return EXIT_FAILURE;
+	}
+	app.shmid = shmid;
+
+	uint32_t *argb = wob_shm_alloc(shmid, app.wob_geom->size);
+	if (argb == NULL) {
 		return EXIT_FAILURE;
 	}