From e77f6a45143343565f3efe06487ccb18dd8dd071 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Mon, 20 Apr 2009 09:37:11 +0000 Subject: Prefix interface vars with if so we don't stamp on generic names like 'flags'. --- configure.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.c b/configure.c index 5d8b6b41..48385a2f 100644 --- a/configure.c +++ b/configure.c @@ -182,16 +182,16 @@ make_env(const struct interface *iface, char ***argv) env[2] = xmalloc(e); snprintf(env[2], e, "pid=%d", getpid()); env[3] = xmalloc(e); - snprintf(env[3], e, "metric=%d", iface->metric); + snprintf(env[3], e, "ifmetric=%d", iface->metric); env[4] = xmalloc(e); - snprintf(env[4], e, "wireless=%d", iface->wireless); + snprintf(env[4], e, "ifwireless=%d", iface->wireless); env[5] = xmalloc(e); - snprintf(env[5], e, "flags=%u", iface->flags); - l = e = strlen("interface_order="); + snprintf(env[5], e, "ifflags=%u", iface->flags); + l = e = strlen("iforder="); for (ifp = ifaces; ifp; ifp = ifp->next) e += strlen(ifp->name) + 1; p = env[6] = xmalloc(e); - strlcpy(p, "interface_order=", e); + strlcpy(p, "iforder=", e); e -= l; p += l; for (ifp = ifaces; ifp; ifp = ifp->next) { -- cgit v1.2.3