summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2006-05-28 02:39:10 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2006-05-28 02:39:10 +0000
commit24536e9b33000952996361aa6f27bdec540fd274 (patch)
tree67c60751e7760995c28a04e0544cd78dde0b7484
parent7656d1fa9d7ccb931a35e955fcd90f5fb3144830 (diff)
downloadvte-24536e9b33000952996361aa6f27bdec540fd274.tar.gz
Bug 342549 – uninitialized var (coverity) Patch from Paolo Borelli.
2006-05-27 Behdad Esfahbod <behdad@gnome.org> Bug 342549 – uninitialized var (coverity) Patch from Paolo Borelli. * src/vte.c (vte_cell_is_selected): Remove uninitialized var ret.
-rw-r--r--ChangeLog8
-rw-r--r--src/vte.c7
2 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index c218f91c..2eb67c78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,15 @@
2006-05-27 Behdad Esfahbod <behdad@gnome.org>
+ Bug 342549 – uninitialized var (coverity)
+ Patch from Paolo Borelli.
+
+ * src/vte.c (vte_cell_is_selected): Remove uninitialized var ret.
+
+2006-05-27 Behdad Esfahbod <behdad@gnome.org>
+
Bug 342082 – vte_invalidate_region() may check whether terminal is
realiazed or not
+ Patch from Kouhei Sutou.
* src/vte.c (vte_invalidate_region): Return if not realized.
diff --git a/src/vte.c b/src/vte.c
index 2c6418d7..60e3315d 100644
--- a/src/vte.c
+++ b/src/vte.c
@@ -4308,7 +4308,6 @@ static gboolean
vte_cell_is_selected(VteTerminal *terminal, glong col, glong row, gpointer data)
{
struct selection_cell_coords ss, se;
- gboolean ret;
/* If there's nothing selected, it's an easy question to answer. */
if (!terminal->pvt->has_selection) {
@@ -4323,7 +4322,7 @@ vte_cell_is_selected(VteTerminal *terminal, glong col, glong row, gpointer data)
}
/* Limit selection in block mode. */
- if (ret && terminal->pvt->block_mode) {
+ if (terminal->pvt->block_mode) {
if (col < ss.x || col > se.x) {
return FALSE;
}
@@ -4331,9 +4330,7 @@ vte_cell_is_selected(VteTerminal *terminal, glong col, glong row, gpointer data)
/* Now it boils down to whether or not the point is between the
* begin and endpoint of the selection. */
- ret = vte_cell_is_between(col, row, ss.x, ss.y, se.x, se.y, TRUE);
-
- return ret;
+ return vte_cell_is_between(col, row, ss.x, ss.y, se.x, se.y, TRUE);
}
/* Once we get text data, actually paste it in. */