From: Andreas Schneider <asn@cryptomilk.org>
Date: Wed, 5 Apr 2017 08:16:15 +0000 (+0200)
Subject: src: Do not use C++ keywords as local variables
X-Git-Tag: cmocka-1.1.1~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=71ea4830f9f69af92a23d9bd256eb3870765f510;p=platform%2Fupstream%2Fcmocka.git

src: Do not use C++ keywords as local variables
---

diff --git a/src/cmocka.c b/src/cmocka.c
index 6efb4ec..d455710 100644
--- a/src/cmocka.c
+++ b/src/cmocka.c
@@ -1912,7 +1912,7 @@ void *_test_realloc(void *ptr,
     MallocBlockInfo *block_info;
     char *block = ptr;
     size_t block_size = size;
-    void *new;
+    void *new_block;
 
     if (ptr == NULL) {
         return _test_malloc(size, file, line);
@@ -1926,8 +1926,8 @@ void *_test_realloc(void *ptr,
     block_info = (MallocBlockInfo*)(block - (MALLOC_GUARD_SIZE +
                                              sizeof(*block_info)));
 
-    new = _test_malloc(size, file, line);
-    if (new == NULL) {
+    new_block = _test_malloc(size, file, line);
+    if (new_block == NULL) {
         return NULL;
     }
 
@@ -1935,12 +1935,12 @@ void *_test_realloc(void *ptr,
         block_size = block_info->size;
     }
 
-    memcpy(new, ptr, block_size);
+    memcpy(new_block, ptr, block_size);
 
     /* Free previous memory */
     _test_free(ptr, file, line);
 
-    return new;
+    return new_block;
 }
 #define realloc test_realloc