Remove unused variables; patch by Christian Hesse

diff --git a/src/plugins/tnef_parse/ytnef.c b/src/plugins/tnef_parse/ytnef.c
index 4babbb5ada780e9ffec867e4a5ceb132303ef5a2..a2e7ed3944dcd6c21ceabc7faa6701118f343dd4 100644 (file)
--- a/src/plugins/tnef_parse/ytnef.c
+++ b/src/plugins/tnef_parse/ytnef.c
@@ -317,14 +317,10 @@ int TNEFIcon STD_ARGLIST {
 
 // -----------------------------------------------------------------------------
 int TNEFRecipTable STD_ARGLIST {
-    DWORD count;
     BYTE *d;
-    int current_row;
-    int propcount;
-    int current_prop;
 
     d = data;
-    count = SwapDWord(d);
+    SwapDWord(d);
     d += 4;
 //    printf("Recipient Table containing %u rows\n", count);
 

diff --git a/src/plugins/vcalendar/libical/libical/icalrecur.c b/src/plugins/vcalendar/libical/libical/icalrecur.c
index 159b448e36d09c9545b855a14de2821bbd887fc1..9c07e792be19c7a0a18ea9b34e30db5d05005c2b 100644 (file)
--- a/src/plugins/vcalendar/libical/libical/icalrecur.c
+++ b/src/plugins/vcalendar/libical/libical/icalrecur.c
@@ -1272,10 +1272,12 @@ int next_hour(struct icalrecur_iterator_impl* impl)
 int next_day(struct icalrecur_iterator_impl* impl)
 {
 
-  short has_by_data = (impl->by_ptrs[BY_DAY][0]!=ICAL_RECURRENCE_ARRAY_MAX);
   short this_frequency = (impl->rule.freq == ICAL_DAILY_RECURRENCE);
+#ifndef NDEBUG
+  short has_by_data = (impl->by_ptrs[BY_DAY][0]!=ICAL_RECURRENCE_ARRAY_MAX);
 
   assert(has_by_data || this_frequency);
+#endif /* NDEBUG */
 
   if (next_hour(impl) == 0){
       return 0;
@@ -1434,9 +1436,11 @@ int next_month(struct icalrecur_iterator_impl* impl)
 {
     int data_valid = 1;
     
+#ifndef NDEBUG
     short this_frequency = (impl->rule.freq == ICAL_MONTHLY_RECURRENCE);
     
     assert( has_by_data(impl,BY_MONTH) || this_frequency);
+#endif /* NDEBUG */
   
     /* Iterate through the occurrences within a day. If we don't get to
        the end of the intra-day data, don't bother going to the next
@@ -1582,7 +1586,6 @@ int next_week(struct icalrecur_iterator_impl* impl)
   if( has_by_data){
     /* Use the Week Number byrule data */
       int week_no;
-      struct icaltimetype t;
       
       impl->by_indices[BY_WEEK_NO]++;
       
@@ -1593,10 +1596,6 @@ int next_week(struct icalrecur_iterator_impl* impl)
          end_of_data = 1;
       }
       
-      t = impl->last;
-      t.month=1; /* HACK, should be setting to the date of the first week of year*/
-      t.day=1;
-      
       week_no = impl->by_ptrs[BY_WEEK_NO][impl->by_indices[BY_WEEK_NO]];
       
       impl->last.day += week_no*7;
@@ -1624,7 +1623,7 @@ pvl_list expand_by_day(struct icalrecur_iterator_impl* impl,short year)
     int i;
     pvl_list days_list = pvl_newlist();
 
-    short start_dow, end_dow, end_year_day, start_doy;
+    short start_dow, end_year_day, start_doy;
     struct icaltimetype tmp = impl->last;
     
     tmp.year= year;
@@ -1641,7 +1640,6 @@ pvl_list expand_by_day(struct icalrecur_iterator_impl* impl,short year)
     tmp.day--;
     tmp = icaltime_normalize(tmp);
     
-    end_dow =  icaltime_day_of_week(tmp);
     end_year_day = icaltime_day_of_year(tmp);
     
     for(i = 0; BYDAYPTR[i] != ICAL_RECURRENCE_ARRAY_MAX; i++){
@@ -1769,17 +1767,6 @@ int expand_year_days(struct icalrecur_iterator_impl* impl,short year)
     case 1<<BY_WEEK_NO: {
         /* FREQ=YEARLY; BYWEEKNO=20,50 */
 
-       struct icaltimetype t;
-       short dow;
-
-       t.day = impl->dtstart.day;
-       t.month = impl->dtstart.month;
-       t.year = year;
-       t.is_date = 1;
-
-        dow = icaltime_day_of_week(t);
-       /* HACK Not finished */ 
-       
         break;
     }
 

diff --git a/src/plugins/vcalendar/libical/libical/icalrestriction.c.in b/src/plugins/vcalendar/libical/libical/icalrestriction.c.in
index 454442531ff337a35c14149cd78a97223aab8702..e027a835c388198574fe841961e4b97c05bc3085 100644 (file)
--- a/src/plugins/vcalendar/libical/libical/icalrestriction.c.in
+++ b/src/plugins/vcalendar/libical/libical/icalrestriction.c.in
@@ -271,7 +271,6 @@ int icalrestriction_check_component(icalproperty_method method,
     icalcomponent_kind comp_kind;
     icalrestriction_kind restr;
     icalrestriction_property_record *prop_record;
-    icalrestriction_component_record *comp_record;
     char* funcr = 0;
     icalproperty *prop;
 

diff --git a/src/plugins/vcalendar/libical/libical/icalvalue.c b/src/plugins/vcalendar/libical/libical/icalvalue.c
index c245095b9c3094bfe1d3e01cc2e0852433dc8e52..9306514db4ae25c47fe5594a9e439b8667a143b8 100644 (file)
--- a/src/plugins/vcalendar/libical/libical/icalvalue.c
+++ b/src/plugins/vcalendar/libical/libical/icalvalue.c
@@ -539,12 +539,9 @@ icalvalue_is_valid (icalvalue* value)
 
 char* icalvalue_binary_as_ical_string(icalvalue* value) {
 
-    const char* data;
     char* str;
     icalerror_check_arg_rz( (value!=0),"value");
 
-    data = icalvalue_get_binary(value);
-
     str = (char*)icalmemory_tmp_buffer(60);
     sprintf(str,"icalvalue_binary_as_ical_string is not implemented yet");
 

diff --git a/src/plugins/vcalendar/libical/libical/sspm.c b/src/plugins/vcalendar/libical/libical/sspm.c
index 7606521940069d75bc250facd4aaa4124018a385..731a5d575903248258b51c549eed1ae53fda1913 100644 (file)
--- a/src/plugins/vcalendar/libical/libical/sspm.c
+++ b/src/plugins/vcalendar/libical/libical/sspm.c
@@ -1012,7 +1012,6 @@ int sspm_parse_mime(struct sspm_part *parts,
 {
     struct mime_impl impl;
     struct sspm_header header;
-    void *part;
     int i;
 
     /* Initialize all of the data */
@@ -1037,13 +1036,7 @@ int sspm_parse_mime(struct sspm_part *parts,
     sspm_read_header(&impl,&header);
 
     if(header.major == SSPM_MULTIPART_MAJOR_TYPE){
-       struct sspm_header *child_header;
-       child_header = &(impl.parts[impl.part_no].header);
-       
        sspm_store_part(&impl,header,impl.level,0,0);
-
-       part = sspm_make_multipart_part(&impl,child_header);
-
     } else {
        void *part;
        size_t size;