Merge pull request #19 from SpiraMirabilis/master

Couple quick changes for C++14 compliance.
toddsundsted · Jul 14, 2017 · 140d97e · 140d97e
2 parents 9ffa0d9 + 35f2e3d
commit 140d97e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/db_verbs.cc b/db_verbs.cc
@@ -169,7 +169,8 @@ db_match_prep(const char *prepname)
 	else
 	    return prep;
     }
-    if ((ptr = strchr(s, '/')) != '\0')
+    ptr = strchr(s, '/');
+    if (ptr != NULL)
 	*ptr = '\0';
 
     argv = parse_into_words(s, &argc);

diff --git a/net_multi.cc b/net_multi.cc
@@ -643,7 +643,7 @@ network_set_client_echo(network_handle nh, int is_on)
 #define TN_ECHO	1
 
     static char telnet_cmd[4] =
-	{TN_IAC, 0, TN_ECHO, 0};
+	{(char)TN_IAC, (char)0, (char)TN_ECHO, (char)0};
 
     h->client_echo = is_on;
     if (is_on)