d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert tok from enum tok to int32_t in function calls

Browse Source 
get_token(..) returns int32_t, not enum tok, and in many cases tests for items
not in enum tok (e.g. '('). Make the typing consistent with get_token, which
includes a domino effect of changing enum tok to int32_t.

MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
Enji Cooper 2016-05-14 23:29:41 +00:00
parent 9193516e94
commit 4a2b63d5bb
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpimport.c
View File

@ -513,7 +513,7 @@ snmp_import_update_table(enum snmp_tbl_entry te, struct snmp_index_entry *tbl)
}
static int32_t
parse_enum(struct snmp_toolinfo *snmptoolctx, enum tok *tok,
parse_enum(struct snmp_toolinfo *snmptoolctx, int32_t *tok,
struct enum_pairs *enums)
{
while ((*tok = gettoken(snmptoolctx)) == TOK_STR) {
@ -532,7 +532,7 @@ parse_enum(struct snmp_toolinfo *snmptoolctx, enum tok *tok,
}
static int32_t
parse_subtype(struct snmp_toolinfo *snmptoolctx, enum tok *tok,
parse_subtype(struct snmp_toolinfo *snmptoolctx, int32_t *tok,
enum snmp_tc *tc)
{
if ((*tok = gettoken(snmptoolctx)) != TOK_STR) {
@ -547,7 +547,7 @@ parse_subtype(struct snmp_toolinfo *snmptoolctx, enum tok *tok,
}
static int32_t
parse_type(struct snmp_toolinfo *snmptoolctx, enum tok *tok,
parse_type(struct snmp_toolinfo *snmptoolctx, int32_t *tok,
enum snmp_tc *tc, struct enum_pairs **snmp_enum)
{
int32_t syntax, mem;
@ -630,9 +630,8 @@ snmp_import_head(struct snmp_toolinfo *snmptoolctx)
static int32_t
snmp_import_table(struct snmp_toolinfo *snmptoolctx, struct snmp_oid2str *obj)
{
int32_t i;
int32_t i, tok;
enum snmp_tc tc;
enum tok tok;
struct snmp_index_entry *entry;
if ((entry = calloc(1, sizeof(struct snmp_index_entry))) == NULL) {
@ -704,7 +703,7 @@ snmp_import_table(struct snmp_toolinfo *snmptoolctx, struct snmp_oid2str *obj)
* Read everything after the syntax type that is certainly a leaf OID info.
*/
static int32_t
snmp_import_leaf(struct snmp_toolinfo *snmptoolctx, enum tok *tok,
snmp_import_leaf(struct snmp_toolinfo *snmptoolctx, int32_t *tok,
struct snmp_oid2str *oid2str)
{
int32_t i, syntax;
@ -757,7 +756,7 @@ snmp_import_object(struct snmp_toolinfo *snmptoolctx)
{
char *string;
int i;
enum tok tok;
int32_t tok;
struct snmp_oid2str *oid2str;
if (snmp_import_head(snmptoolctx) < 0)
@ -855,7 +854,7 @@ snmp_import_object(struct snmp_toolinfo *snmptoolctx)
}
static int32_t
snmp_import_tree(struct snmp_toolinfo *snmptoolctx, enum tok *tok)
snmp_import_tree(struct snmp_toolinfo *snmptoolctx, int32_t *tok)
{
while (*tok != TOK_EOF) {
switch (*tok) {
@ -881,7 +880,7 @@ snmp_import_tree(struct snmp_toolinfo *snmptoolctx, enum tok *tok)
}
static int32_t
snmp_import_top(struct snmp_toolinfo *snmptoolctx, enum tok *tok)
snmp_import_top(struct snmp_toolinfo *snmptoolctx, int32_t *tok)
{
enum snmp_tc tc;
struct enum_type *t;
@ -938,7 +937,7 @@ static int32_t
snmp_import(struct snmp_toolinfo *snmptoolctx)
{
int i;
enum tok tok;
int32_t tok;
tok = gettoken(snmptoolctx);