From 68e6f1607006b816fb63fd173bcc986111fe5607 Mon Sep 17 00:00:00 2001
From: Stefan Walter <stefw@src.gnome.org>
Date: Fri, 13 Feb 2009 18:05:26 +0000
Subject: [PATCH] Use size_t and gsize for memory sizes rather than unsigned
 long.

Fixes bug #571615

svn path=/trunk/; revision=1563
---
 egg/egg-buffer.h        |  2 +-
 egg/egg-secure-memory.c | 10 +++++-----
 egg/egg-secure-memory.h | 12 +++++++-----
 gcr/gcr-library.c       |  2 +-
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/egg/egg-buffer.h b/egg/egg-buffer.h
index c937460..23cb40f 100644
--- a/egg/egg-buffer.h
+++ b/egg/egg-buffer.h
@@ -55,7 +55,7 @@
  */
 
 /* The allocator for the EggBuffer. This follows the realloc() syntax and logic */
-typedef void* (*EggBufferAllocator) (void* p, unsigned long len);
+typedef void* (*EggBufferAllocator) (void* p, size_t len);
 
 typedef struct _EggBuffer {
 	unsigned char *buf;
diff --git a/egg/egg-secure-memory.c b/egg/egg-secure-memory.c
index 6735ac3..eb8a498 100644
--- a/egg/egg-secure-memory.c
+++ b/egg/egg-secure-memory.c
@@ -617,7 +617,7 @@ sec_allocated (Block *block, void *memory)
  */
 
 static void*
-sec_acquire_pages (unsigned long *sz)
+sec_acquire_pages (size_t *sz)
 {
 	void *pages;
 	unsigned long pgsize;
@@ -664,7 +664,7 @@ sec_acquire_pages (unsigned long *sz)
 }
 
 static void
-sec_release_pages (void *pages, unsigned long sz)
+sec_release_pages (void *pages, size_t sz)
 {
 	ASSERT (pages);
 	ASSERT (sz % getpagesize () == 0);
@@ -690,7 +690,7 @@ sec_release_pages (void *pages, unsigned long sz)
 static Block *all_blocks = NULL;
 
 static Block*
-sec_block_create (unsigned long size)
+sec_block_create (size_t size)
 {
 	Block *block;
 	Cell *cell;
@@ -826,7 +826,7 @@ egg_secure_realloc (void *memory, size_t length)
 }
 
 void*
-egg_secure_realloc_full (void *memory, unsigned long length, int flags)
+egg_secure_realloc_full (void *memory, size_t length, int flags)
 {
 	Block *block = NULL;
 	size_t previous = 0;
@@ -971,7 +971,7 @@ egg_secure_dump_blocks (void)
 char*
 egg_secure_strdup (const char *str)
 {
-	unsigned long len;
+	size_t len;
 	char *res;
 
 	if (!str)
diff --git a/egg/egg-secure-memory.h b/egg/egg-secure-memory.h
index f4ddf3c..b5e709e 100644
--- a/egg/egg-secure-memory.h
+++ b/egg/egg-secure-memory.h
@@ -24,6 +24,8 @@
 #ifndef EGG_SECURE_MEMORY_H
 #define EGG_SECURE_MEMORY_H
 
+#include <stdlib.h>
+
 /* -------------------------------------------------------------------
  * Low Level Secure Memory
  *
@@ -51,7 +53,7 @@ extern void   egg_memory_unlock (void);
  *
  * Same call semantics as realloc with regard to NULL and zeros
  */
-extern void*  egg_memory_fallback (void *p, unsigned long sz);
+extern void*  egg_memory_fallback (void *p, size_t length);
 
 
 /*
@@ -62,13 +64,13 @@ extern void*  egg_memory_fallback (void *p, unsigned long sz);
 
 #define GKR_SECURE_USE_FALLBACK     0x0001
 
-void*  egg_secure_alloc        (unsigned long sz);
+void*  egg_secure_alloc        (size_t length);
 
-void*  egg_secure_alloc_full   (unsigned long, int flags);
+void*  egg_secure_alloc_full   (size_t length, int flags);
 
-void*  egg_secure_realloc      (void *p, unsigned long sz);
+void*  egg_secure_realloc      (void *p, size_t length);
 
-void*  egg_secure_realloc_full (void *p, unsigned long sz, int fallback);
+void*  egg_secure_realloc_full (void *p, size_t length, int fallback);
 
 void   egg_secure_free         (void* p);
 
diff --git a/gcr/gcr-library.c b/gcr/gcr-library.c
index 4a1a6d0..b5e2ab8 100644
--- a/gcr/gcr-library.c
+++ b/gcr/gcr-library.c
@@ -72,7 +72,7 @@ egg_memory_unlock (void)
 }
 
 void*
-egg_memory_fallback (void *p, unsigned long sz)
+egg_memory_fallback (void *p, size_t sz)
 {
 	const gchar *env;
 
-- 
2.7.4