extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2024-12-25 08:09:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nicholas Marriott 2012-07-09 09:55:57 +00:00
parent 91f54b59ac
commit a3391692ad
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
status.c
View File

@ -515,6 +515,9 @@ status_replace(struct client *c, struct session *s, struct winlink *wl,
char in[BUFSIZ], ch, *iptr, *optr; char in[BUFSIZ], ch, *iptr, *optr;
size_t len; size_t len;
if (fmt == NULL)
return (xstrdup(""));
len = strftime(in, sizeof in, fmt, localtime(&t)); len = strftime(in, sizeof in, fmt, localtime(&t));
in[len] = '\0'; 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, c->prompt_string = status_replace(c, NULL, NULL, NULL, msg,
time(NULL), 0); time(NULL), 0);
if (input == NULL)
input = "";
c->prompt_buffer = status_replace(c, NULL, NULL, NULL, input, c->prompt_buffer = status_replace(c, NULL, NULL, NULL, input,
time(NULL), 0); time(NULL), 0);
c->prompt_index = strlen(c->prompt_buffer); 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); time(NULL), 0);
xfree(c->prompt_buffer); xfree(c->prompt_buffer);
if (input == NULL)
input = "";
c->prompt_buffer = status_replace(c, NULL, NULL, NULL, input, c->prompt_buffer = status_replace(c, NULL, NULL, NULL, input,
time(NULL), 0); time(NULL), 0);
c->prompt_index = strlen(c->prompt_buffer); c->prompt_index = strlen(c->prompt_buffer);