summaryrefslogtreecommitdiff
path: root/src/fe-text/gui-entry.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/fe-text/gui-entry.c')
-rw-r--r--src/fe-text/gui-entry.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/fe-text/gui-entry.c b/src/fe-text/gui-entry.c
index 949a43d3..82645a8e 100644
--- a/src/fe-text/gui-entry.c
+++ b/src/fe-text/gui-entry.c
@@ -540,6 +540,7 @@ void gui_entry_insert_char(GUI_ENTRY_REC *entry, unichar chr)
char *gui_entry_get_cutbuffer(GUI_ENTRY_REC *entry)
{
+ GUI_ENTRY_CUTBUFFER_REC *tmp;
char *buf;
int i;
@@ -548,7 +549,7 @@ char *gui_entry_get_cutbuffer(GUI_ENTRY_REC *entry)
if (entry->kill_ring == NULL || entry->kill_ring->data == NULL)
return NULL;
- GUI_ENTRY_CUTBUFFER_REC *tmp = entry->kill_ring->data;
+ tmp = entry->kill_ring->data;
if (tmp->cutbuffer == NULL)
return NULL;
@@ -568,12 +569,14 @@ char *gui_entry_get_cutbuffer(GUI_ENTRY_REC *entry)
char *gui_entry_get_next_cutbuffer(GUI_ENTRY_REC *entry)
{
+ GUI_ENTRY_CUTBUFFER_REC *tmp;
+
g_return_val_if_fail(entry != NULL, NULL);
if (entry->kill_ring == NULL)
return NULL;
- GUI_ENTRY_CUTBUFFER_REC *tmp = entry->kill_ring->data;
+ tmp = entry->kill_ring->data;
entry->kill_ring = g_slist_remove(entry->kill_ring, tmp);
entry->kill_ring = g_slist_append(entry->kill_ring, tmp);
@@ -594,7 +597,7 @@ void gui_entry_erase_to(GUI_ENTRY_REC *entry, int pos, CUTBUFFER_UPDATE_OP updat
static GUI_ENTRY_CUTBUFFER_REC *get_cutbuffer_rec(GUI_ENTRY_REC *entry, CUTBUFFER_UPDATE_OP update_cutbuffer)
{
- GUI_ENTRY_CUTBUFFER_REC *tmp = NULL;
+ GUI_ENTRY_CUTBUFFER_REC *tmp;
g_return_val_if_fail(entry != NULL, NULL);