From 19cba89127381d9dc06d1e823b123231496e9a3d Mon Sep 17 00:00:00 2001 From: Tharre Date: Tue, 11 Nov 2014 14:45:56 +0100 Subject: Fix indentation --- src/util.c | 72 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'src/util.c') diff --git a/src/util.c b/src/util.c index 5fc6d47..797c84d 100644 --- a/src/util.c +++ b/src/util.c @@ -16,54 +16,54 @@ void *safe_malloc_(size_t size, const char *file, unsigned line) { - assert(size > 0); - void *ptr = malloc(size); - if (!ptr) - fatal_(file, line, ERRM_MALLOC, size); + assert(size > 0); + void *ptr = malloc(size); + if (!ptr) + fatal_(file, line, ERRM_MALLOC, size); - return ptr; + return ptr; } void *safe_realloc_(void *ptr, size_t size, const char *file, unsigned line) { - assert(size > 0 && ptr); - void *ptr2 = realloc(ptr, size); - if (!ptr2) - fatal_(file, line, ERRM_REALLOC, size); + assert(size > 0 && ptr); + void *ptr2 = realloc(ptr, size); + if (!ptr2) + fatal_(file, line, ERRM_REALLOC, size); - return ptr2; + return ptr2; } char *safe_strdup_(const char *str, const char *file, unsigned line) { - assert(str); - size_t len = strlen(str) + 1; - char *ptr = malloc(len); - if (!ptr) - fatal_(file, line, ERRM_MALLOC, len); + assert(str); + size_t len = strlen(str) + 1; + char *ptr = malloc(len); + if (!ptr) + fatal_(file, line, ERRM_MALLOC, len); - return memcpy(ptr, str, len); + return memcpy(ptr, str, len); } /* For concating multiple strings into a single larger one. */ char *concat(size_t count, ...) { - assert(count > 0); - va_list ap, ap2; - va_start(ap, count); - va_copy(ap2, ap); - size_t i, size = 0, args_len[count]; - for (i = 0; i < count; ++i) { - args_len[i] = strlen(va_arg(ap, char*)); - size += args_len[i]; - } - ++size; - char *result = safe_malloc(size); - /* debug("Allocated %zu bytes at %p\n", size, result); */ - uintptr_t offset = 0; - for (i = 0; i < count; ++i) { - strcpy(&result[offset], va_arg(ap2, char*)); - offset += args_len[i]; - } - va_end(ap); - va_end(ap2); - return result; + assert(count > 0); + va_list ap, ap2; + va_start(ap, count); + va_copy(ap2, ap); + size_t i, size = 0, args_len[count]; + for (i = 0; i < count; ++i) { + args_len[i] = strlen(va_arg(ap, char*)); + size += args_len[i]; + } + ++size; + char *result = safe_malloc(size); + /* debug("Allocated %zu bytes at %p\n", size, result); */ + uintptr_t offset = 0; + for (i = 0; i < count; ++i) { + strcpy(&result[offset], va_arg(ap2, char*)); + offset += args_len[i]; + } + va_end(ap); + va_end(ap2); + return result; } -- cgit v1.2.3-70-g09d2