Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(37)

Unified Diff: third_party/lzma_sdk/7zAlloc.c

Issue 10152012: Second attempt to update lzma_sdk to 9.20 (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/lzma_sdk/7zAlloc.h ('k') | third_party/lzma_sdk/7zBuf.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/lzma_sdk/7zAlloc.c
diff --git a/third_party/lzma_sdk/Archive/7z/7zAlloc.c b/third_party/lzma_sdk/7zAlloc.c
similarity index 80%
rename from third_party/lzma_sdk/Archive/7z/7zAlloc.c
rename to third_party/lzma_sdk/7zAlloc.c
index 21bb30c7c2349f09b592ea80e67a55251167e8bc..964b28db38ec8f18ca7209e121258399a7ba56ed 100644
--- a/third_party/lzma_sdk/Archive/7z/7zAlloc.c
+++ b/third_party/lzma_sdk/7zAlloc.c
@@ -1,6 +1,6 @@
-/* 7zAlloc.c */
+/* 7zAlloc.c -- Allocation functions
+2010-10-29 : Igor Pavlov : Public domain */
-#include <stdlib.h>
#include "7zAlloc.h"
/* #define _SZ_ALLOC_DEBUG */
@@ -11,13 +11,16 @@
#ifdef _WIN32
#include <windows.h>
#endif
+
#include <stdio.h>
int g_allocCount = 0;
int g_allocCountTemp = 0;
+
#endif
-void *SzAlloc(size_t size)
+void *SzAlloc(void *p, size_t size)
{
+ p = p;
if (size == 0)
return 0;
#ifdef _SZ_ALLOC_DEBUG
@@ -27,8 +30,9 @@ void *SzAlloc(size_t size)
return malloc(size);
}
-void SzFree(void *address)
+void SzFree(void *p, void *address)
{
+ p = p;
#ifdef _SZ_ALLOC_DEBUG
if (address != 0)
{
@@ -39,8 +43,9 @@ void SzFree(void *address)
free(address);
}
-void *SzAllocTemp(size_t size)
+void *SzAllocTemp(void *p, size_t size)
{
+ p = p;
if (size == 0)
return 0;
#ifdef _SZ_ALLOC_DEBUG
@@ -53,8 +58,9 @@ void *SzAllocTemp(size_t size)
return malloc(size);
}
-void SzFreeTemp(void *address)
+void SzFreeTemp(void *p, void *address)
{
+ p = p;
#ifdef _SZ_ALLOC_DEBUG
if (address != 0)
{
« no previous file with comments | « third_party/lzma_sdk/7zAlloc.h ('k') | third_party/lzma_sdk/7zBuf.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698