Mesa (master): util: Fix util_dynarray_trim().

Michał Król michal at kemper.freedesktop.org
Tue Apr 13 08:00:54 UTC 2010


Module: Mesa
Branch: master
Commit: ddc42b6380d0380a6f519df268a8b3531ddb81fb
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ddc42b6380d0380a6f519df268a8b3531ddb81fb

Author: Michal Krol <michal at vmware.com>
Date:   Tue Apr 13 08:59:49 2010 +0100

util: Fix util_dynarray_trim().

---

 src/gallium/auxiliary/util/u_dynarray.h |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_dynarray.h b/src/gallium/auxiliary/util/u_dynarray.h
index 5597581..9d1c171 100644
--- a/src/gallium/auxiliary/util/u_dynarray.h
+++ b/src/gallium/auxiliary/util/u_dynarray.h
@@ -87,15 +87,16 @@ util_dynarray_grow(struct util_dynarray *buf, int diff)
 static INLINE void
 util_dynarray_trim(struct util_dynarray *buf)
 {
-   if(buf->size != buf->capacity)
-   {}
-   else if(buf->size) {
-      buf->data = REALLOC(buf->data, buf->capacity, buf->size);
-      buf->capacity = buf->size;
-   } else {
-      FREE(buf->data);
-      buf->data = 0;
-      buf->capacity = 0;
+   if (buf->size != buf->capacity) {
+      if (buf->size) {
+         buf->data = REALLOC(buf->data, buf->capacity, buf->size);
+         buf->capacity = buf->size;
+      }
+      else {
+         FREE(buf->data);
+         buf->data = 0;
+         buf->capacity = 0;
+      }
    }
 }
 




More information about the mesa-commit mailing list