From 4719786e18c85c3b8ab937124e83b9e8430c1bfa Mon Sep 17 00:00:00 2001 From: Tharre Date: Mon, 14 Apr 2014 04:19:50 +0200 Subject: Convert all tabs to whitespaces --- src/util.c | 64 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'src/util.c') diff --git a/src/util.c b/src/util.c index e67ec18..80734c5 100644 --- a/src/util.c +++ b/src/util.c @@ -13,48 +13,48 @@ /* A safe malloc wrapper. */ void *ec_malloc(size_t size) { void *ptr = malloc(size); - if(ptr == NULL) - fatal("redo: cannot allocate %zu bytes", size); - + if (!ptr) + fatal("redo: cannot allocate %zu bytes", size); + return ptr; } /* 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 = ec_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 = ec_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; } char *xbasename(const char *path) { - assert(path); - char *ptr = strrchr(path, '/'); - return ptr? ptr+1 : (char*) path; + assert(path); + char *ptr = strrchr(path, '/'); + return ptr? ptr+1 : (char*) path; } char *ec_strdup(const char* str) { - assert(str); - size_t len = strlen(str) + 1; - char *ptr = malloc(len); - if (!ptr) - fatal("redo: failed to duplicate string"); + assert(str); + size_t len = strlen(str) + 1; + char *ptr = malloc(len); + if (!ptr) + fatal("redo: failed to duplicate string"); - return memcpy(ptr, str, len);; + return memcpy(ptr, str, len);; } -- cgit v1.2.3-70-g09d2