1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00

Use null check convention in statusbar.c

This commit is contained in:
James Booth 2015-05-04 23:07:36 +01:00
parent dda812cd3e
commit bf5646aee3

View File

@ -95,7 +95,7 @@ create_status_bar(void)
mvwprintw(status_bar, 0, cols - 34 + ((current - 1) * 3), bracket); mvwprintw(status_bar, 0, cols - 34 + ((current - 1) * 3), bracket);
wattroff(status_bar, bracket_attrs); wattroff(status_bar, bracket_attrs);
if (last_time != NULL) { if (last_time) {
g_date_time_unref(last_time); g_date_time_unref(last_time);
} }
last_time = g_date_time_new_now_local(); last_time = g_date_time_new_now_local();
@ -127,7 +127,7 @@ status_bar_resize(void)
mvwprintw(status_bar, 0, cols - 34 + ((current - 1) * 3), bracket); mvwprintw(status_bar, 0, cols - 34 + ((current - 1) * 3), bracket);
wattroff(status_bar, bracket_attrs); wattroff(status_bar, bracket_attrs);
if (message != NULL) { if (message) {
char *time_pref = prefs_get_string(PREF_TIME_STATUSBAR); char *time_pref = prefs_get_string(PREF_TIME_STATUSBAR);
if (g_strcmp0(time_pref, "minutes") == 0) { if (g_strcmp0(time_pref, "minutes") == 0) {
mvwprintw(status_bar, 0, 10, message); mvwprintw(status_bar, 0, 10, message);
@ -137,7 +137,7 @@ status_bar_resize(void)
mvwprintw(status_bar, 0, 1, message); mvwprintw(status_bar, 0, 1, message);
} }
} }
if (last_time != NULL) { if (last_time) {
g_date_time_unref(last_time); g_date_time_unref(last_time);
} }
last_time = g_date_time_new_now_local(); last_time = g_date_time_new_now_local();
@ -297,7 +297,7 @@ status_bar_print_message(const char * const msg)
{ {
werase(status_bar); werase(status_bar);
if (message != NULL) { if (message) {
free(message); free(message);
} }
message = strdup(msg); message = strdup(msg);
@ -325,7 +325,7 @@ status_bar_print_message(const char * const msg)
void void
status_bar_clear(void) status_bar_clear(void)
{ {
if (message != NULL) { if (message) {
free(message); free(message);
message = NULL; message = NULL;
} }
@ -346,7 +346,7 @@ status_bar_clear(void)
void void
status_bar_clear_message(void) status_bar_clear_message(void)
{ {
if (message != NULL) { if (message) {
free(message); free(message);
message = NULL; message = NULL;
} }
@ -428,7 +428,7 @@ _mark_inactive(int num)
static void static void
_status_bar_draw(void) _status_bar_draw(void)
{ {
if (last_time != NULL) { if (last_time) {
g_date_time_unref(last_time); g_date_time_unref(last_time);
} }
last_time = g_date_time_new_now_local(); last_time = g_date_time_new_now_local();