Move a NULL check inside a function, from Tiago Cunha.

1 files changed, 3 insertions, 4 deletions

diff --git a/status.c b/status.c
index b90d1885..a1c23286 100644
--- a/status.c
+++ b/status.c
@@ -515,6 +515,9 @@ status_replace(struct client *c, struct session *s, struct winlink *wl,
 	char		in[BUFSIZ], ch, *iptr, *optr;
 	size_t		len;
 
+	if (fmt == NULL)
+		return (xstrdup(""));
+
 	len = strftime(in, sizeof in, fmt, localtime(&t));
 	in[len] = '\0';
 
@@ -877,8 +880,6 @@ status_prompt_set(struct client *c, const char *msg, const char *input,
 	c->prompt_string = status_replace(c, NULL, NULL, NULL, msg,
 	    time(NULL), 0);
 
-	if (input == NULL)
-		input = "";
 	c->prompt_buffer = status_replace(c, NULL, NULL, NULL, input,
 	    time(NULL), 0);
 	c->prompt_index = strlen(c->prompt_buffer);
@@ -932,8 +933,6 @@ status_prompt_update(struct client *c, const char *msg, const char *input)
 	    time(NULL), 0);
 
 	xfree(c->prompt_buffer);
-	if (input == NULL)
-		input = "";
 	c->prompt_buffer = status_replace(c, NULL, NULL, NULL, input,
 	    time(NULL), 0);
 	c->prompt_index = strlen(c->prompt_buffer);