From d89bbe9ffaddfc656cd38604e8991af77975565f Mon Sep 17 00:00:00 2001
From: pfelt <pfelt@52461e19-6027-0410-9301-c4706890ca92>
Date: Sat, 11 Jun 2011 18:21:23 +0000
Subject: [PATCH] -- remove a couple of unused variables

---
 src/libs/cal/bongo-cal-instance.c |  3 ---
 src/libs/cal/bongo-cal-recur.c    |  8 ++++----
 src/libs/cal/bongo-cal-timezone.c |  7 +++----
 src/libs/cal/cal-convert.c        | 12 ++++++------
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/libs/cal/bongo-cal-instance.c b/src/libs/cal/bongo-cal-instance.c
index ff82208..dc14ed3 100644
--- a/src/libs/cal/bongo-cal-instance.c
+++ b/src/libs/cal/bongo-cal-instance.c
@@ -784,7 +784,6 @@ BongoCalInstanceGetLastEnd(BongoCalInstance *instance)
     BongoSList *rrules;
     BongoCalTime lastRecur;
     BongoCalTime end;
-    BOOL done;
     
     end = BongoCalInstanceGetEnd(instance);
 
@@ -794,7 +793,6 @@ BongoCalInstanceGetLastEnd(BongoCalInstance *instance)
 
     BongoCalRecurEnsureEndDates(instance, FALSE, TimezoneCb, instance);
 
-    done = FALSE;
     lastRecur = BongoCalTimeEmpty();
 
     if (BongoCalInstanceGetRRules(instance, &rrules)) {
@@ -807,7 +805,6 @@ BongoCalInstanceGetLastEnd(BongoCalInstance *instance)
                 /* Infinitely-recurring rule, lastend is MAX_RECUR */
                 lastRecur = BongoCalTimeEmpty();
                 lastRecur.year = MAX_YEAR;
-                done = TRUE;
                 break;
             }
 
diff --git a/src/libs/cal/bongo-cal-recur.c b/src/libs/cal/bongo-cal-recur.c
index 652b7b1..8b1e242 100644
--- a/src/libs/cal/bongo-cal-recur.c
+++ b/src/libs/cal/bongo-cal-recur.c
@@ -1695,7 +1695,7 @@ CalObjInitializeRecurData (RecurData  *recurData,
                            CalObjTime *eventStart)
 {
     BongoList *elem;
-    int month, yearday, monthday, weekday, week_num, hour, minute, second;
+    int month, yearday, monthday, weekday, hour, minute, second;
 
     /* Clear the entire RecurData. */
     memset (recurData, 0, sizeof (RecurData));
@@ -1747,7 +1747,7 @@ CalObjInitializeRecurData (RecurData  *recurData,
         weekday = BongoListVoidToInt(elem->data);
         elem = elem->next;
         /* The week number is not used when filtering. */
-        week_num = BongoListVoidToInt(elem->data);
+        //week_num = BongoListVoidToInt(elem->data);
         elem = elem->next;
 
         recurData->weekdays[weekday] = 1;
@@ -2971,7 +2971,7 @@ CalObjByDayExpandWeekly (RecurData  *recurData,
     GArray *new_occs;
     CalObjTime *occ;
     BongoList *elem;
-    int len, i, weekday, week_num;
+    int len, i, weekday;
     int weekdayOffset, new_weekdayOffset;
 
     /* If BYDAY has not been specified, or the array is empty, just
@@ -2999,7 +2999,7 @@ CalObjByDayExpandWeekly (RecurData  *recurData,
             /* FIXME: Currently we just ignore this, but maybe we
                should skip all elements where week_num != 0.
                The spec isn't clear about this. */
-            week_num = BongoListVoidToInt(elem->data);
+            //week_num = BongoListVoidToInt(elem->data);
             DPRINT("week num is %d\n", week_num);
 
             elem = elem->next;
diff --git a/src/libs/cal/bongo-cal-timezone.c b/src/libs/cal/bongo-cal-timezone.c
index 8909ff2..b3e0784 100644
--- a/src/libs/cal/bongo-cal-timezone.c
+++ b/src/libs/cal/bongo-cal-timezone.c
@@ -514,7 +514,6 @@ BongoCalTimezoneGetUtcOffset(BongoCalTimezone *tz,
 {
     TimezoneChange tChange;
     TimezoneChange *zoneChange;
-    TimezoneChange *prevZoneChange;
     int changeNum;
     int changeNumToUse;
     int step;
@@ -621,13 +620,13 @@ BongoCalTimezoneGetUtcOffset(BongoCalTimezone *tz,
         TimezoneChange tmpChange = *zoneChange;
 
         tmpChange = AdjustChange (tmpChange, 0, 0, 0, tmpChange.prevUtcOffset);
-        if (CompareChange (&tChange, &tmpChange) < 0) {
+        //if (CompareChange (&tChange, &tmpChange) < 0) {
             /* The time is in the overlapped region, so we may need to use
                either the current zone_change or the previous one. If the
                time has the is_daylight field set we use the matching change,
                else we use the change with standard time. */
-            prevZoneChange = &g_array_index(tz->changes, TimezoneChange, changeNumToUse - 1);
-        }
+            //prevZoneChange = &g_array_index(tz->changes, TimezoneChange, changeNumToUse - 1);
+        //}
     }
 
     /* Now we know exactly which timezone change applies to the time, so
diff --git a/src/libs/cal/cal-convert.c b/src/libs/cal/cal-convert.c
index 75b9ab6..1736812 100644
--- a/src/libs/cal/cal-convert.c
+++ b/src/libs/cal/cal-convert.c
@@ -623,9 +623,9 @@ static void
 IcalValueToJsonDateTimePeriod(icalproperty *prop, BongoJsonObject *obj, icalvalue_kind kind)
 {
     struct icaldatetimeperiodtype dtperiod;
-    BongoJsonObject *value;
+    //BongoJsonObject *value;
 
-    value = BongoJsonObjectNew();
+    //value = BongoJsonObjectNew();
 
     dtperiod = icalvalue_get_datetimeperiod(icalproperty_get_value(prop));
 
@@ -696,12 +696,12 @@ static void
 IcalRecurPropertyToJsonKeywordArray(char *key, char *value, BongoJsonObject *obj)
 {
     GArray *array;
-    char *dup;
+    //char *dup;
     char *split[100];
     int n;
     int i;
 
-    dup = MemStrdup(value);    
+    //dup = MemStrdup(value);    
     array = g_array_sized_new(FALSE, FALSE, sizeof(BongoJsonNode*), 10);
 
     do {
@@ -750,12 +750,12 @@ static void
 IcalRecurPropertyToJsonIntArray(char *key, char *value, BongoJsonObject *obj)
 {
     GArray *array;
-    char *dup;
+    //char *dup;
     char *split[100];
     int n;
     int i;
 
-    dup = MemStrdup(value);    
+    //dup = MemStrdup(value);    
     array = g_array_sized_new(FALSE, FALSE, sizeof(BongoJsonNode*), 10);
 
     do {