projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Always try next Address when an outgoing connection fails to authenticate.
[tinc]
/
lib
/
xmalloc.c
diff --git
a/lib/xmalloc.c
b/lib/xmalloc.c
index
9563391
..
e4079ce
100644
(file)
--- a/
lib/xmalloc.c
+++ b/
lib/xmalloc.c
@@
-34,6
+34,7
@@
void *realloc ();
void free ();
#endif
void free ();
#endif
+#include "dropin.h"
#include "xalloc.h"
#ifndef EXIT_FAILURE
#include "xalloc.h"
#ifndef EXIT_FAILURE
@@
-55,7
+56,7
@@
int xalloc_exit_failure = EXIT_FAILURE;
char *const xalloc_msg_memory_exhausted = "Memory exhausted";
/* FIXME: describe */
char *const xalloc_msg_memory_exhausted = "Memory exhausted";
/* FIXME: describe */
-void (*xalloc_fail_func) (int) =
0
;
+void (*xalloc_fail_func) (int) =
NULL
;
static void
xalloc_fail (int size)
static void
xalloc_fail (int size)
@@
-69,13
+70,12
@@
xalloc_fail (int size)
/* Allocate N bytes of memory dynamically, with error checking. */
void *
/* Allocate N bytes of memory dynamically, with error checking. */
void *
-xmalloc (n)
- size_t n;
+xmalloc (size_t n)
{
void *p;
p = malloc (n);
{
void *p;
p = malloc (n);
- if (p ==
0
)
+ if (p ==
NULL
)
xalloc_fail ((int)n);
return p;
}
xalloc_fail ((int)n);
return p;
}
@@
-83,13
+83,12
@@
xmalloc (n)
/* Allocate N bytes of memory dynamically, and set it all to zero. */
void *
/* Allocate N bytes of memory dynamically, and set it all to zero. */
void *
-xmalloc_and_zero (n)
- size_t n;
+xmalloc_and_zero (size_t n)
{
void *p;
p = malloc (n);
{
void *p;
p = malloc (n);
- if (p ==
0
)
+ if (p ==
NULL
)
xalloc_fail ((int)n);
memset (p, '\0', n);
return p;
xalloc_fail ((int)n);
memset (p, '\0', n);
return p;
@@
-100,12
+99,10
@@
xmalloc_and_zero (n)
If P is NULL, run xmalloc. */
void *
If P is NULL, run xmalloc. */
void *
-xrealloc (p, n)
- void *p;
- size_t n;
+xrealloc (void *p, size_t n)
{
p = realloc (p, n);
{
p = realloc (p, n);
- if (p ==
0
)
+ if (p ==
NULL
)
xalloc_fail (n);
return p;
}
xalloc_fail (n);
return p;
}
@@
-133,7
+130,7
@@
xcalloc (n, s)
void *p;
p = calloc (n, s);
void *p;
p = calloc (n, s);
- if (p ==
0
)
+ if (p ==
NULL
)
xalloc_fail ();
return p;
}
xalloc_fail ();
return p;
}