diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-06-04 10:31:37 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-06-04 10:31:37 -0700 |
| commit | db08408462ac8afa1b95aec4eb8d3efeb283025d (patch) | |
| tree | ece8ff3df7fce16c95c4057f32346beae979dbd0 /bgpd/bgp_aspath.c | |
| parent | cd2ec99e4e365bd61deebd61639cd3e1e777cdbe (diff) | |
| parent | 6e0989e113d9e2268e58cfe29922e971793c1d06 (diff) | |
| download | quagga-db08408462ac8afa1b95aec4eb8d3efeb283025d.tar.bz2 quagga-db08408462ac8afa1b95aec4eb8d3efeb283025d.tar.xz | |
Merge branch 'upstream' into jenner
Conflicts:
bgpd/bgp_aspath.c
bgpd/bgpd.c
lib/smux.c
lib/workqueue.c
ospfd/ospf_snmp.c
Diffstat (limited to 'bgpd/bgp_aspath.c')
| -rw-r--r-- | bgpd/bgp_aspath.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bgpd/bgp_aspath.c b/bgpd/bgp_aspath.c index e703941d..a7c72a9d 100644 --- a/bgpd/bgp_aspath.c +++ b/bgpd/bgp_aspath.c @@ -559,7 +559,7 @@ aspath_make_str_count (struct aspath *as) if (seg->type != AS_SEQUENCE) { - str_buf = aspath_expand(str_buf, &str_size, len, 1); + str_buf = aspath_expand(str_buf, &str_size, len, 1); /* %c */ len += snprintf (str_buf + len, str_size - len, "%c", aspath_delimiter_char (seg->type, AS_SEG_START)); @@ -1743,8 +1743,8 @@ aspath_key_make (void *p) static int aspath_cmp (const void *arg1, const void *arg2) { - const struct assegment *seg1 = ((struct aspath *)arg1)->segments; - const struct assegment *seg2 = ((struct aspath *)arg2)->segments; + const struct assegment *seg1 = ((const struct aspath *)arg1)->segments; + const struct assegment *seg2 = ((const struct aspath *)arg2)->segments; while (seg1 || seg2) { |