From b6c5974b3781449996f2791b80e22c9fa6c9ba18 Mon Sep 17 00:00:00 2001 From: Andrea Fioraldi Date: Fri, 17 Jan 2020 16:41:30 +0100 Subject: format --- src/afl-sharedmem.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'src/afl-sharedmem.c') diff --git a/src/afl-sharedmem.c b/src/afl-sharedmem.c index bad41f88..f8ed4e51 100644 --- a/src/afl-sharedmem.c +++ b/src/afl-sharedmem.c @@ -72,8 +72,8 @@ static s32 shm_id; /* ID of the SHM region */ static s32 cmplog_shm_id; #endif -int cmplog_mode; -struct cmp_map* cmp_map; +int cmplog_mode; +struct cmp_map *cmp_map; /* Get rid of shared memory (atexit handler). */ @@ -96,8 +96,7 @@ void remove_shm(void) { #else shmctl(shm_id, IPC_RMID, NULL); - if (cmplog_mode) - shmctl(cmplog_shm_id, IPC_RMID, NULL); + if (cmplog_mode) shmctl(cmplog_shm_id, IPC_RMID, NULL); #endif } @@ -155,15 +154,16 @@ void setup_shm(unsigned char dumb_mode) { shm_id = shmget(IPC_PRIVATE, MAP_SIZE, IPC_CREAT | IPC_EXCL | 0600); if (shm_id < 0) PFATAL("shmget() failed"); - + if (cmplog_mode) { - - cmplog_shm_id = shmget(IPC_PRIVATE, sizeof(struct cmp_map), IPC_CREAT | IPC_EXCL | 0600); - + + cmplog_shm_id = shmget(IPC_PRIVATE, sizeof(struct cmp_map), + IPC_CREAT | IPC_EXCL | 0600); + if (cmplog_shm_id < 0) PFATAL("shmget() failed"); } - + atexit(remove_shm); shm_str = alloc_printf("%d", shm_id); @@ -176,21 +176,20 @@ void setup_shm(unsigned char dumb_mode) { if (!dumb_mode) setenv(SHM_ENV_VAR, shm_str, 1); ck_free(shm_str); - + if (cmplog_mode) { - + shm_str = alloc_printf("%d", cmplog_shm_id); if (!dumb_mode) setenv(CMPLOG_SHM_ENV_VAR, shm_str, 1); ck_free(shm_str); - + } trace_bits = shmat(shm_id, NULL, 0); - - if (cmplog_mode) - cmp_map = shmat(cmplog_shm_id, NULL, 0); + + if (cmplog_mode) cmp_map = shmat(cmplog_shm_id, NULL, 0); if (!trace_bits) PFATAL("shmat() failed"); -- cgit 1.4.1