From 0f4e572462e29a21e3c99ba4b92925866560bff3 Mon Sep 17 00:00:00 2001
From: Richard Aas <richard@db.org>
Date: Tue, 10 Apr 2012 09:32:34 +0000
Subject: [PATCH] use str_isset()

---
 src/ice/stunsrv.c | 2 +-
 src/net/if.c      | 2 +-
 src/sdp/attr.c    | 2 +-
 src/sdp/msg.c     | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/ice/stunsrv.c b/src/ice/stunsrv.c
index b55709e..6c0c257 100644
--- a/src/ice/stunsrv.c
+++ b/src/ice/stunsrv.c
@@ -266,7 +266,7 @@ int icem_stund_recv(struct icem_comp *comp, const struct sa *src,
 	}
 	if (pl_strcmp(&lu, ice->lufrag))
 		goto unauth;
-	if (str_len(icem->rufrag) && pl_strcmp(&ru, icem->rufrag))
+	if (str_isset(icem->rufrag) && pl_strcmp(&ru, icem->rufrag))
 		goto unauth;
 
 	attr = stun_msg_attr(req, STUN_ATTR_CONTROLLED);
diff --git a/src/net/if.c b/src/net/if.c
index f3728bb..b14a658 100644
--- a/src/net/if.c
+++ b/src/net/if.c
@@ -79,7 +79,7 @@ static bool if_getaddr_handler(const char *ifname,
 	struct ifentry *ife = arg;
 
 	/* Match name of interface? */
-	if (str_len(ife->ifname) && 0 != str_casecmp(ife->ifname, ifname))
+	if (str_isset(ife->ifname) && 0 != str_casecmp(ife->ifname, ifname))
 		return false;
 
 	if (!sa_isset(sa, SA_ADDR))
diff --git a/src/sdp/attr.c b/src/sdp/attr.c
index 6f4f2e6..00e6e24 100644
--- a/src/sdp/attr.c
+++ b/src/sdp/attr.c
@@ -68,7 +68,7 @@ int sdp_attr_addv(struct list *lst, const char *name, const char *val,
 
 	err = str_dup(&attr->name, name);
 
-	if (str_len(val) > 0)
+	if (str_isset(val))
 		err |= re_vsdprintf(&attr->val, val, ap);
 
 	if (err)
diff --git a/src/sdp/msg.c b/src/sdp/msg.c
index a2d45b0..05598b6 100644
--- a/src/sdp/msg.c
+++ b/src/sdp/msg.c
@@ -393,7 +393,7 @@ static int media_encode(const struct sdp_media *m, struct mbuf *mb, bool offer)
 
 		const struct sdp_format *fmt = le->data;
 
-		if (!fmt->sup || !str_len(fmt->name))
+		if (!fmt->sup || !str_isset(fmt->name))
 			continue;
 
 		err |= mbuf_printf(mb, "a=rtpmap:%s %s/%u",
@@ -404,7 +404,7 @@ static int media_encode(const struct sdp_media *m, struct mbuf *mb, bool offer)
 
 		err |= mbuf_printf(mb, "\r\n");
 
-		if (str_len(fmt->params))
+		if (str_isset(fmt->params))
 			err |= mbuf_printf(mb, "a=fmtp:%s %s\r\n",
 					   fmt->id, fmt->params);
 	}