summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/smux.c4
-rw-r--r--lib/workqueue.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/smux.c b/lib/smux.c
index d5378897..9f3c3922 100644
--- a/lib/smux.c
+++ b/lib/smux.c
@@ -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);