Module Name: src
Committed By: matt
Date: Sun Jan 19 22:31:13 UTC 2014
Modified Files:
src/sbin/ifconfig: af_link.c
Log Message:
Rename link to link_pkw to avoid shadowing the link syscall.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sbin/ifconfig/af_link.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ifconfig/af_link.c
diff -u src/sbin/ifconfig/af_link.c:1.6 src/sbin/ifconfig/af_link.c:1.7
--- src/sbin/ifconfig/af_link.c:1.6 Tue Apr 21 22:46:39 2009
+++ src/sbin/ifconfig/af_link.c Sun Jan 19 22:31:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: af_link.c,v 1.6 2009/04/21 22:46:39 dyoung Exp $ */
+/* $NetBSD: af_link.c,v 1.7 2014/01/19 22:31:13 matt Exp $ */
/*-
* Copyright (c) 2008 David Young. All rights reserved.
@@ -27,7 +27,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: af_link.c,v 1.6 2009/04/21 22:46:39 dyoung Exp $");
+__RCSID("$NetBSD: af_link.c,v 1.7 2014/01/19 22:31:13 matt Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -59,7 +59,7 @@ static const struct kwinst linkkw[] = {
.k_bool = true, .k_nextparser = &command_root.pb_parser}
};
-struct pkw link = PKW_INITIALIZER(&link, "link", NULL, NULL,
+struct pkw link_pkw = PKW_INITIALIZER(&link_pkw, "link", NULL, NULL,
linkkw, __arraycount(linkkw), NULL);
static struct afswtch af = {
@@ -127,6 +127,6 @@ static void
link_constructor(void)
{
register_family(&af);
- cmdloop_branch_init(&branch, &link.pk_parser);
+ cmdloop_branch_init(&branch, &link_pkw.pk_parser);
register_cmdloop_branch(&branch);
}
