[Xfce4-commits] [apps/orage] 01/01: 4.11.2.1 Coverity fix 31726

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

juha pushed a commit to branch master
in repository apps/orage.

commit dac070ff2ce3ba66fc7bb7755fe0d6aa34646c2d
Author: Juha Kautto <juha at xfce.org>
Date:   Tue Feb 24 14:28:22 2015 +0200

    4.11.2.1 Coverity fix 31726
    
    Removing debug variables, which are not needed.
---
 configure.in.in  |    2 +-
 src/event-list.c |   22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 8cc2933..21676c8 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto <juha at xfce.org>
 dnl
 
 dnl Version information
-m4_define([orage_version], [4.11.2.1-git])
+m4_define([orage_version], [4.11.2.2-git])
 
 m4_define([gtk_minimum_version], [2.14.0])
 m4_define([xfce_minimum_version], [4.8.0])
diff --git a/src/event-list.c b/src/event-list.c
index 63fb407..c995d07 100644
--- a/src/event-list.c
+++ b/src/event-list.c
@@ -163,7 +163,7 @@ static char *format_time(el_win *el, xfical_appt *appt, char *par)
 {
     char *result;
     char *tmp;
-    int i = 0;
+    int i = 0, j = 0;
     char *start_ical_time;
     char *end_ical_time;
     gboolean same_date;
@@ -178,14 +178,14 @@ static char *format_time(el_win *el, xfical_appt *appt, char *par)
         /* special formatting for 1 day VEVENTS */
         if (start_ical_time[8] == 'T') { /* time part available */
             if (strncmp(start_ical_time, par, 8) < 0)
-                i = g_strlcpy(result, "+00:00 ", 50);
+                g_strlcpy(result, "+00:00 ", 50);
             else
-                i += append_time(result, start_ical_time, i);
+                append_time(result, start_ical_time, i);
             i = g_strlcat(result, "- ", 50);
             if (strncmp(par, end_ical_time , 8) < 0)
-                i = g_strlcat(result, "24:00+", 50);
+                g_strlcat(result, "24:00+", 50);
             else
-                i += append_time(result, end_ical_time, i);
+                append_time(result, end_ical_time, i);
         }
         else {/* date only appointment */
             i = g_strlcpy(result, _("All day"), 50);
@@ -197,10 +197,10 @@ static char *format_time(el_win *el, xfical_appt *appt, char *par)
         i = g_strlcpy(result, tmp, 50);
         if (start_ical_time[8] == 'T') { /* time part available */
             result[i++] = ' ';
-            i += append_time(result, start_ical_time, i);
+            append_time(result, start_ical_time, i);
             i = g_strlcat(result, "- ", 50);
             if (el->page == TODO_PAGE && !appt->use_due_time) {
-                i = g_strlcat(result, "...", 50);
+                g_strlcat(result, "...", 50);
             }
             else {
                 if (!same_date) {
@@ -209,18 +209,18 @@ static char *format_time(el_win *el, xfical_appt *appt, char *par)
                     i = g_strlcat(result, tmp, 50);
                     result[i++] = ' ';
                 }
-                i += append_time(result, end_ical_time, i);
+                append_time(result, end_ical_time, i);
             }
         }
         else {/* date only */
-            i = g_strlcat(result, " - ", 50);
+            g_strlcat(result, " - ", 50);
             if (el->page == TODO_PAGE && !appt->use_due_time) {
-                i = g_strlcat(result, "...", 50);
+                g_strlcat(result, "...", 50);
             }
             else {
                 t = orage_icaltime_to_tm_time(appt->endtimecur, TRUE);
                 tmp = orage_tm_date_to_i18_date(&t);
-                i = g_strlcat(result, tmp, 50);
+                g_strlcat(result, tmp, 50);
             }
         }
     }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.