From 37381fe1bc8429dfbee62f7520181d48dd24d9c8 Mon Sep 17 00:00:00 2001 From: Emanuele Giaquinta Date: Sun, 9 Mar 2008 23:03:45 +0000 Subject: [PATCH] Simplify history handling in key_send_line. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4745 dbcabf3a-b0e7-0310-adc4-f8d773084564 --- src/fe-text/gui-readline.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/fe-text/gui-readline.c b/src/fe-text/gui-readline.c index 09802f17..5ef25021 100644 --- a/src/fe-text/gui-readline.c +++ b/src/fe-text/gui-readline.c @@ -535,13 +535,14 @@ static void sig_gui_key_pressed(gpointer keyp) static void key_send_line(void) { HISTORY_REC *history; - char *str, *add_history; + char *str; + int add_history; str = gui_entry_get_text(active_entry); /* we can't use gui_entry_get_text() later, since the entry might have been destroyed after we get back */ - add_history = *str == '\0' ? NULL : g_strdup(str); + add_history = *str != '\0'; history = command_history_current(active_win); if (redir == NULL) { @@ -550,15 +551,14 @@ static void key_send_line(void) active_win->active); } else { if (redir->flags & ENTRY_REDIRECT_FLAG_HIDDEN) - g_free_and_null(add_history); + add_history = 0; handle_entry_redirect(str); } - if (add_history != NULL) { + if (add_history) { history = command_history_find(history); if (history != NULL) - command_history_add(history, add_history); - g_free(add_history); + command_history_add(history, str); } if (active_entry != NULL)