diff options
| author | ngie <ngie@FreeBSD.org> | 2016-01-04 07:03:58 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2016-01-04 07:03:58 +0000 |
| commit | 3f2a3e5af6a6637beddbc055f06a675892a65112 (patch) | |
| tree | 7a09e24883594bc41a76dad83134ed6983ded862 | |
| parent | 873e27fb072a63ca6d489b4900212ccbe9212d9f (diff) | |
| download | FreeBSD-src-3f2a3e5af6a6637beddbc055f06a675892a65112.zip FreeBSD-src-3f2a3e5af6a6637beddbc055f06a675892a65112.tar.gz | |
MFC r292815:
Staticize several variables that are used exclusively in bsnmpd/main.c and
bsnmpd/trap.c
This fixes several -Wmissing-variable-declaration warnings noted by clang
| -rw-r--r-- | contrib/bsnmp/snmpd/main.c | 16 | ||||
| -rw-r--r-- | contrib/bsnmp/snmpd/trap.c | 6 |
2 files changed, 13 insertions, 9 deletions
diff --git a/contrib/bsnmp/snmpd/main.c b/contrib/bsnmp/snmpd/main.c index e7257b5..cbd1893 100644 --- a/contrib/bsnmp/snmpd/main.c +++ b/contrib/bsnmp/snmpd/main.c @@ -119,26 +119,30 @@ static struct lmodules modules_start = TAILQ_HEAD_INITIALIZER(modules_start); struct community_list community_list = TAILQ_HEAD_INITIALIZER(community_list); /* list of all known USM users */ -struct usm_userlist usm_userlist = SLIST_HEAD_INITIALIZER(usm_userlist); +static struct usm_userlist usm_userlist = SLIST_HEAD_INITIALIZER(usm_userlist); /* A list of all VACM users configured, including v1, v2c and v3 */ -struct vacm_userlist vacm_userlist = SLIST_HEAD_INITIALIZER(vacm_userlist); +static struct vacm_userlist vacm_userlist = + SLIST_HEAD_INITIALIZER(vacm_userlist); /* A list of all VACM groups */ -struct vacm_grouplist vacm_grouplist = SLIST_HEAD_INITIALIZER(vacm_grouplist); +static struct vacm_grouplist vacm_grouplist = + SLIST_HEAD_INITIALIZER(vacm_grouplist); static struct vacm_group vacm_default_group = { .groupname = "", }; /* The list of configured access entries */ -struct vacm_accesslist vacm_accesslist = TAILQ_HEAD_INITIALIZER(vacm_accesslist); +static struct vacm_accesslist vacm_accesslist = + TAILQ_HEAD_INITIALIZER(vacm_accesslist); /* The list of configured views */ -struct vacm_viewlist vacm_viewlist = SLIST_HEAD_INITIALIZER(vacm_viewlist); +static struct vacm_viewlist vacm_viewlist = + SLIST_HEAD_INITIALIZER(vacm_viewlist); /* The list of configured contexts */ -struct vacm_contextlist vacm_contextlist = +static struct vacm_contextlist vacm_contextlist = SLIST_HEAD_INITIALIZER(vacm_contextlist); /* list of all installed object resources */ diff --git a/contrib/bsnmp/snmpd/trap.c b/contrib/bsnmp/snmpd/trap.c index bf02708..aa9dd93 100644 --- a/contrib/bsnmp/snmpd/trap.c +++ b/contrib/bsnmp/snmpd/trap.c @@ -60,15 +60,15 @@ struct trapsink_list trapsink_list = TAILQ_HEAD_INITIALIZER(trapsink_list); /* List of target addresses */ -struct target_addresslist target_addresslist = +static struct target_addresslist target_addresslist = SLIST_HEAD_INITIALIZER(target_addresslist); /* List of target parameters */ -struct target_paramlist target_paramlist = +static struct target_paramlist target_paramlist = SLIST_HEAD_INITIALIZER(target_paramlist); /* List of notification targets */ -struct target_notifylist target_notifylist = +static struct target_notifylist target_notifylist = SLIST_HEAD_INITIALIZER(target_notifylist); static const struct asn_oid oid_begemotTrapSinkTable = |
