diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-05-20 03:29:14 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2015-05-20 03:29:14 +0200 |
| commit | ed2eb093c75183167524205111fb4ae3e253e4a9 (patch) | |
| tree | 5e6cc1fb8b9b49374c2e430c4d3e9507ac2e9d83 /ospfd/ospf_routemap.c | |
| parent | ripd: ripd-warnings.patch (diff) | |
| download | frr-ed2eb093c75183167524205111fb4ae3e253e4a9.tar.xz frr-ed2eb093c75183167524205111fb4ae3e253e4a9.zip | |
ospfd: ospfd-warnings.patch
Remove compile warnings for the ospfd/ospf6d directory
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by:
Diffstat (limited to 'ospfd/ospf_routemap.c')
| -rw-r--r-- | ospfd/ospf_routemap.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/ospfd/ospf_routemap.c b/ospfd/ospf_routemap.c index 6e02de3a1..b2f1c6712 100644 --- a/ospfd/ospf_routemap.c +++ b/ospfd/ospf_routemap.c @@ -45,7 +45,6 @@ ospf_route_map_update (const char *name) { struct ospf *ospf; int type; - u_short instance; // PENDING /* If OSPF instatnce does not exist, return right now. */ ospf = ospf_lookup (); @@ -532,15 +531,18 @@ route_set_metric_compile (const char *arg) set metric <+/-metric> check Ignore the +/- component */ if (! all_digit (arg)) - if ((strncmp (arg, "+", 1) == 0 || strncmp (arg, "-", 1) == 0) && - all_digit (arg+1)) - { - zlog_warn ("OSPF does not support 'set metric +/-'"); - arg++; - } - else - return NULL; - + { + if ((strncmp (arg, "+", 1) == 0 || strncmp (arg, "-", 1) == 0) && + all_digit (arg+1)) + { + zlog_warn ("OSPF does not support 'set metric +/-'"); + arg++; + } + else + { + return NULL; + } + } metric = XCALLOC (MTYPE_ROUTE_MAP_COMPILED, sizeof (u_int32_t)); ret = atoi (arg); |