diff options
author | David Barksdale <amatus.amongus@gmail.com> | 2016-09-04 15:27:58 +0000 |
---|---|---|
committer | David Barksdale <amatus.amongus@gmail.com> | 2016-09-04 15:27:58 +0000 |
commit | 330db1cce63a198b86cf0bcaa9949c20d7681d05 (patch) | |
tree | ab2ffa29580f5588eca504aa85a05b4d57b76c4a /src/util/common_allocation.c | |
parent | ff480b91b81af25ffdf3f5586f978659fae48fcd (diff) | |
download | gnunet-330db1cce63a198b86cf0bcaa9949c20d7681d05.tar.gz gnunet-330db1cce63a198b86cf0bcaa9949c20d7681d05.zip |
I think this is a bit more readable
Diffstat (limited to 'src/util/common_allocation.c')
-rw-r--r-- | src/util/common_allocation.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/util/common_allocation.c b/src/util/common_allocation.c index 91d0a600a..71dd46bf1 100644 --- a/src/util/common_allocation.c +++ b/src/util/common_allocation.c | |||
@@ -351,7 +351,7 @@ void | |||
351 | GNUNET_xgrow_ (void **old, | 351 | GNUNET_xgrow_ (void **old, |
352 | size_t elementSize, | 352 | size_t elementSize, |
353 | unsigned int *oldCount, | 353 | unsigned int *oldCount, |
354 | unsigned int newCount, | 354 | unsigned int newCount, |
355 | const char *filename, | 355 | const char *filename, |
356 | int linenumber) | 356 | int linenumber) |
357 | { | 357 | { |
@@ -360,20 +360,20 @@ GNUNET_xgrow_ (void **old, | |||
360 | 360 | ||
361 | GNUNET_assert_at (INT_MAX / elementSize > newCount, filename, linenumber); | 361 | GNUNET_assert_at (INT_MAX / elementSize > newCount, filename, linenumber); |
362 | size = newCount * elementSize; | 362 | size = newCount * elementSize; |
363 | if (size == 0) | 363 | if (0 == size) |
364 | { | 364 | { |
365 | tmp = NULL; | 365 | tmp = NULL; |
366 | } | 366 | } |
367 | else | 367 | else |
368 | { | 368 | { |
369 | tmp = GNUNET_xmalloc_ (size, filename, linenumber); | 369 | tmp = GNUNET_xmalloc_ (size, filename, linenumber); |
370 | if (*oldCount > newCount) | ||
371 | *oldCount = newCount; /* shrink is also allowed! */ | ||
372 | if (NULL != *old) | 370 | if (NULL != *old) |
373 | GNUNET_memcpy (tmp, *old, elementSize * (*oldCount)); | 371 | { |
372 | GNUNET_memcpy (tmp, *old, elementSize * GNUNET_MIN(*oldCount, newCount)); | ||
373 | } | ||
374 | } | 374 | } |
375 | 375 | ||
376 | if (*old != NULL) | 376 | if (NULL != *old) |
377 | { | 377 | { |
378 | GNUNET_xfree_ (*old, filename, linenumber); | 378 | GNUNET_xfree_ (*old, filename, linenumber); |
379 | } | 379 | } |