j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Replace asprintf() by xasprintf().

Browse source
This commit is contained in:
Guus Sliepen 2009-09-08 18:18:36 +02:00
parent 3e55dc77f4
commit 73d77dd416
13 changed files with 52 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/graph.c
View file

@ -57,6 +57,7 @@
#include "process.h"
#include "subnet.h"
#include "utils.h"
#include "xalloc.h"
static bool graph_changed = true;
@ -269,18 +270,18 @@ void sssp_bfs(void)
n->mtuevent = NULL;
}
asprintf(&envp[0], "NETNAME=%s", netname ? : "");
asprintf(&envp[1], "DEVICE=%s", device ? : "");
asprintf(&envp[2], "INTERFACE=%s", iface ? : "");
asprintf(&envp[3], "NODE=%s", n->name);
xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
xasprintf(&envp[1], "DEVICE=%s", device ? : "");
xasprintf(&envp[2], "INTERFACE=%s", iface ? : "");
xasprintf(&envp[3], "NODE=%s", n->name);
sockaddr2str(&n->address, &address, &port);
asprintf(&envp[4], "REMOTEADDRESS=%s", address);
asprintf(&envp[5], "REMOTEPORT=%s", port);
xasprintf(&envp[4], "REMOTEADDRESS=%s", address);
xasprintf(&envp[5], "REMOTEPORT=%s", port);
envp[6] = NULL;
execute_script(n->status.reachable ? "host-up" : "host-down", envp);
asprintf(&name,
xasprintf(&name,
n->status.reachable ? "hosts/%s-up" : "hosts/%s-down",
n->name);
execute_script(name, envp);
@ -331,7 +332,7 @@ void dump_graph(void)
if(filename[0] == '|') {
file = popen(filename + 1, "w");
} else {
asprintf(&tmpname, "%s.new", filename);
xasprintf(&tmpname, "%s.new", filename);
file = fopen(tmpname, "w");
}