projects
/
silc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a24dcff
)
Assert if system is out of memory.
author
Pekka Riikonen
<priikone@silcnet.org>
Wed, 5 Jul 2000 06:05:56 +0000
(06:05 +0000)
committer
Pekka Riikonen
<priikone@silcnet.org>
Wed, 5 Jul 2000 06:05:56 +0000
(06:05 +0000)
lib/silccore/silcmemory.c
patch
|
blob
|
history
diff --git
a/lib/silccore/silcmemory.c
b/lib/silccore/silcmemory.c
index e385cd443ea112bc04a2f04ca9999e2c2dd0680b..9a922bf913bf4d638ce0d7cca4544983134f509c 100644
(file)
--- a/
lib/silccore/silcmemory.c
+++ b/
lib/silccore/silcmemory.c
@@
-20,8
+20,11
@@
/*
* $Id$
* $Log$
/*
* $Id$
* $Log$
- * Revision 1.1 2000/06/27 11:36:55 priikone
- * Initial revision
+ * Revision 1.2 2000/07/05 06:05:56 priikone
+ * Assert if system is out of memory.
+ *
+ * Revision 1.1.1.1 2000/06/27 11:36:55 priikone
+ * Imported from internal CVS/Added Log headers.
*
*
*/
*
*
*/
@@
-30,34
+33,46
@@
void *silc_malloc(size_t size)
{
void *silc_malloc(size_t size)
{
+ void *addr;
#ifdef HAVE_MLOCK
#ifdef HAVE_MLOCK
- void *addr = malloc(size);
+ addr = malloc(size);
+ assert(addr != NULL);
mlock(addr, size);
return addr;
#else
mlock(addr, size);
return addr;
#else
- return malloc(size);
+ addr = malloc(size);
+ assert(addr != NULL);
+ return addr;
#endif
}
void *silc_calloc(size_t items, size_t size)
{
#endif
}
void *silc_calloc(size_t items, size_t size)
{
+ void *addr;
#ifdef HAVE_MLOCK
#ifdef HAVE_MLOCK
- void *addr = calloc(items, size);
+ addr = calloc(items, size);
+ assert(addr != NULL);
mlock(addr, size);
return addr;
#else
mlock(addr, size);
return addr;
#else
- return calloc(items, size);
+ addr = calloc(items, size);
+ assert(addr != NULL);
+ return addr;
#endif
}
void *silc_realloc(void *ptr, size_t size)
{
#endif
}
void *silc_realloc(void *ptr, size_t size)
{
+ void *addr;
#ifdef HAVE_MLOCK
#ifdef HAVE_MLOCK
- void *addr = realloc(ptr, size);
+ addr = realloc(ptr, size);
+ assert(addr != NULL);
mlock(addr, size);
return addr;
#else
mlock(addr, size);
return addr;
#else
- return realloc(ptr, size);
+ addr = realloc(ptr, size);
+ assert(addr != NULL);
+ return addr;
#endif
}
#endif
}