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 /lib | |
| 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 'lib')
| -rw-r--r-- | lib/smux.c | 4 | ||||
| -rw-r--r-- | lib/workqueue.c | 6 |
2 files changed, 5 insertions, 5 deletions
@@ -941,7 +941,7 @@ smux_read (struct thread *t) return 0; } -int +static int smux_open (int sock) { u_char buf[BUFSIZ]; @@ -985,7 +985,7 @@ smux_open (int sock) ptr = asn_build_string (ptr, &len, (u_char) (ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_OCTET_STR), - (u_char *) smux_passwd, strlen (smux_passwd)); + (u_char *)smux_passwd, strlen (smux_passwd)); /* Fill in real SMUX header. We exclude ASN header size (2). */ len = BUFSIZ; diff --git a/lib/workqueue.c b/lib/workqueue.c index 0dd36d82..7c811edd 100644 --- a/lib/workqueue.c +++ b/lib/workqueue.c @@ -91,9 +91,9 @@ work_queue_new (struct thread_master *m, const char *queue_name) void work_queue_free (struct work_queue *wq) { - if (wq->thread) - thread_cancel(wq->thread); - + if (wq->thread != NULL) + thread_cancel(wq->thread); + /* list_delete frees items via callback */ list_delete (wq->items); listnode_delete (&work_queues, wq); |