projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced check for status.active by status.dataopen in check_network_activity.
[tinc]
/
lib
/
xmalloc.c
diff --git
a/lib/xmalloc.c
b/lib/xmalloc.c
index
204469f
..
6cb0b82
100644
(file)
--- a/
lib/xmalloc.c
+++ b/
lib/xmalloc.c
@@
-69,7
+69,7
@@
int xalloc_exit_failure = EXIT_FAILURE;
char *const xalloc_msg_memory_exhausted = N_("Memory exhausted");
/* FIXME: describe */
char *const xalloc_msg_memory_exhausted = N_("Memory exhausted");
/* FIXME: describe */
-void (*xalloc_fail_func) () = 0;
+void (*xalloc_fail_func) (
int
) = 0;
#if __STDC__ && (HAVE_VPRINTF || HAVE_DOPRNT)
void error (int, int, const char *, ...);
#if __STDC__ && (HAVE_VPRINTF || HAVE_DOPRNT)
void error (int, int, const char *, ...);
@@
-78,10
+78,10
@@
void error ();
#endif
static void
#endif
static void
-xalloc_fail ()
+xalloc_fail (
int size
)
{
if (xalloc_fail_func)
{
if (xalloc_fail_func)
- (*xalloc_fail_func) ();
+ (*xalloc_fail_func) (
size
);
error (xalloc_exit_failure, 0, xalloc_msg_memory_exhausted);
}
error (xalloc_exit_failure, 0, xalloc_msg_memory_exhausted);
}
@@
-92,10
+92,12
@@
xmalloc (n)
size_t n;
{
void *p;
size_t n;
{
void *p;
+ extern char*cp_file;
+ extern int cp_line;
p = malloc (n);
if (p == 0)
p = malloc (n);
if (p == 0)
- xalloc_fail ();
+ xalloc_fail (
(int)n
);
return p;
}
return p;
}
@@
-110,7
+112,7
@@
xrealloc (p, n)
{
p = realloc (p, n);
if (p == 0)
{
p = realloc (p, n);
if (p == 0)
- xalloc_fail ();
+ xalloc_fail (
n
);
return p;
}
return p;
}