summaryrefslogtreecommitdiff
path: root/src/util
diff options
context:
space:
mode:
authorThomas Helland <thomashelland90@gmail.com>2017-06-01 22:38:59 +0200
committerMarek Olšák <marek.olsak@amd.com>2017-06-07 21:07:24 +0200
commit07653f159f0c871fb301a111174f4fc7e7522661 (patch)
treee9704c9cd776430893260675805430cc6f10f433 /src/util
parentf0372814a9b8676c0b26de30c4cc33ada64baa7b (diff)
util: Remove unused includes and convert to lower-case memory ops
Also, prepare for the next commit by correcting some coding style changes. This should be all non-functional changes. Reviewed-by: Marek Olšák <marek.olsak@amd.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
Diffstat (limited to 'src/util')
-rw-r--r--src/util/u_dynarray.h27
1 files changed, 12 insertions, 15 deletions
diff --git a/src/util/u_dynarray.h b/src/util/u_dynarray.h
index 7b7a093d824..9143c5a60df 100644
--- a/src/util/u_dynarray.h
+++ b/src/util/u_dynarray.h
@@ -27,8 +27,7 @@
#ifndef U_DYNARRAY_H
#define U_DYNARRAY_H
-#include "pipe/p_compiler.h"
-#include "util/u_memory.h"
+#include <stdlib.h>
/* A zero-initialized version of this is guaranteed to represent an
* empty array.
@@ -52,9 +51,8 @@ util_dynarray_init(struct util_dynarray *buf)
static inline void
util_dynarray_fini(struct util_dynarray *buf)
{
- if(buf->data)
- {
- FREE(buf->data);
+ if (buf->data) {
+ free(buf->data);
util_dynarray_init(buf);
}
}
@@ -63,18 +61,18 @@ util_dynarray_fini(struct util_dynarray *buf)
static inline void *
util_dynarray_resize(struct util_dynarray *buf, unsigned newsize)
{
- char *p;
- if(newsize > buf->capacity)
- {
+ void *p;
+ if (newsize > buf->capacity) {
unsigned newcap = buf->capacity << 1;
- if(newsize > newcap)
+ if (newsize > newcap)
newcap = newsize;
- buf->data = REALLOC(buf->data, buf->capacity, newcap);
+ buf->data = realloc(buf->data, newcap);
buf->capacity = newcap;
}
- p = (char *)buf->data + buf->size;
+ p = (void *)((char *)buf->data + buf->size);
buf->size = newsize;
+
return p;
}
@@ -89,11 +87,10 @@ util_dynarray_trim(struct util_dynarray *buf)
{
if (buf->size != buf->capacity) {
if (buf->size) {
- buf->data = REALLOC(buf->data, buf->capacity, buf->size);
+ buf->data = realloc(buf->data, buf->size);
buf->capacity = buf->size;
- }
- else {
- FREE(buf->data);
+ } else {
+ free(buf->data);
buf->data = 0;
buf->capacity = 0;
}