From cfbb77c7101e4f6a1ee3832e57ae119bdc6d7e7b Mon Sep 17 00:00:00 2001
From: angt <angt@users.noreply.github.com>
Date: Wed, 6 Jan 2016 17:57:12 +0100
Subject: [PATCH] Code cleanup

---
 src/main.c   | 6 +++---
 src/option.c | 4 ++--
 src/str.h    | 7 +------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/main.c b/src/main.c
index cb6f557..b2e97ff 100644
--- a/src/main.c
+++ b/src/main.c
@@ -268,7 +268,7 @@ static char *sk_get_name (int fd)
 
 static struct addrinfo *ai_create (const char *host, const char *port, int listener)
 {
-    if (!port || !port[0]) {
+    if (str_empty(port)) {
         gt_log("port is not valid\n");
         return NULL;
     }
@@ -714,7 +714,7 @@ static int gt_setup_secretkey (struct crypto_ctx *ctx, char *keyfile)
 {
     const size_t size = sizeof(ctx->skey);
 
-    if (!keyfile) {
+    if (str_empty(keyfile)) {
         char buf[2*size+1];
 
         randombytes_buf(ctx->skey, size);
@@ -1055,7 +1055,7 @@ int main (int argc, char **argv)
 
         char *sockname = sk_get_name(sock.fd);
 
-        if (!sockname) {
+        if (str_empty(sockname)) {
             close(sock.fd);
             continue;
         }
diff --git a/src/option.c b/src/option.c
index 014187b..3609f47 100644
--- a/src/option.c
+++ b/src/option.c
@@ -5,7 +5,7 @@
 
 int option_str (void *data, int argc, char **argv)
 {
-    if (argc<2 || !argv[1]) {
+    if (argc<2 || str_empty(argv[1])) {
         gt_print("option `%s' need a string argument\n", argv[0]);
         return -1;
     }
@@ -17,7 +17,7 @@ int option_str (void *data, int argc, char **argv)
 
 int option_long (void *data, int argc, char **argv)
 {
-    if (argc<2 || !argv[1]) {
+    if (argc<2 || str_empty(argv[1])) {
         gt_print("option `%s' need an integer argument\n", argv[0]);
         return -1;
     }
diff --git a/src/str.h b/src/str.h
index 7300ed6..6fca67e 100644
--- a/src/str.h
+++ b/src/str.h
@@ -44,12 +44,7 @@ static inline size_t str_len (const char *restrict str)
     if (!str)
         return 0;
 
-    size_t i = 0;
-
-    while (str[i])
-        i++;
-
-    return i;
+    return strlen(str);
 }
 
 static inline char *str_cat (const char *const strs[], size_t count)