From e6c365c156534f762d5d2f882fa9d191de15f1d0 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 22 Oct 2014 07:47:21 +0200
Subject: [PATCH] (7zip) Clean up some 7z code

---
 deps/7zip/7zAlloc.c | 44 --------------------------------------------
 deps/7zip/7zBuf2.c  |  9 +++++----
 2 files changed, 5 insertions(+), 48 deletions(-)

diff --git a/deps/7zip/7zAlloc.c b/deps/7zip/7zAlloc.c
index 4d3c79f98b..74c370e2df 100755
--- a/deps/7zip/7zAlloc.c
+++ b/deps/7zip/7zAlloc.c
@@ -3,43 +3,17 @@
 
 #include "7zAlloc.h"
 
-/* #define _SZ_ALLOC_DEBUG */
-/* use _SZ_ALLOC_DEBUG to debug alloc/free operations */
-
-#ifdef _SZ_ALLOC_DEBUG
-
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
-#include <stdio.h>
-int g_allocCount = 0;
-int g_allocCountTemp = 0;
-
-#endif
-
 void *SzAlloc(void *p, size_t size)
 {
    p = p;
    if (size == 0)
       return 0;
-#ifdef _SZ_ALLOC_DEBUG
-   fprintf(stderr, "\nAlloc %10d bytes; count = %10d", size, g_allocCount);
-   g_allocCount++;
-#endif
    return malloc(size);
 }
 
 void SzFree(void *p, void *address)
 {
    p = p;
-#ifdef _SZ_ALLOC_DEBUG
-   if (address != 0)
-   {
-      g_allocCount--;
-      fprintf(stderr, "\nFree; count = %10d", g_allocCount);
-   }
-#endif
    free(address);
 }
 
@@ -48,29 +22,11 @@ void *SzAllocTemp(void *p, size_t size)
    p = p;
    if (size == 0)
       return 0;
-#ifdef _SZ_ALLOC_DEBUG
-   fprintf(stderr, "\nAlloc_temp %10d bytes;  count = %10d", size, g_allocCountTemp);
-   g_allocCountTemp++;
-#ifdef _WIN32
-   return HeapAlloc(GetProcessHeap(), 0, size);
-#endif
-#endif
    return malloc(size);
 }
 
 void SzFreeTemp(void *p, void *address)
 {
    p = p;
-#ifdef _SZ_ALLOC_DEBUG
-   if (address != 0)
-   {
-      g_allocCountTemp--;
-      fprintf(stderr, "\nFree_temp; count = %10d", g_allocCountTemp);
-   }
-#ifdef _WIN32
-   HeapFree(GetProcessHeap(), 0, address);
-   return;
-#endif
-#endif
    free(address);
 }
diff --git a/deps/7zip/7zBuf2.c b/deps/7zip/7zBuf2.c
index acbe82f616..e6de7599a9 100755
--- a/deps/7zip/7zBuf2.c
+++ b/deps/7zip/7zBuf2.c
@@ -21,12 +21,13 @@ int DynBuf_Write(CDynBuf *p, const uint8_t *buf, size_t size, ISzAlloc *alloc)
 {
    if (size > p->size - p->pos)
    {
-      size_t newSize = p->pos + size;
-      uint8_t *data;
-      newSize += newSize / 4;
-      data = (uint8_t *)alloc->Alloc(alloc, newSize);
+      size_t current_size = p->pos + size;
+      size_t newSize = (current_size) + (current_size / 4);
+      uint8_t *data = (uint8_t *)alloc->Alloc(alloc, newSize);
+
       if (data == 0)
          return 0;
+
       p->size = newSize;
       memcpy(data, p->data, p->pos);
       alloc->Free(alloc, p->data);