[Xfce4-commits] r22745 - in xfcalendar/trunk: libical/src/libical libical/src/libicalss src

[Juha Kautto]

Author: juha
Date: 2006-08-13 15:32:21 +0000 (Sun, 13 Aug 2006)
New Revision: 22745

Modified:
   xfcalendar/trunk/libical/src/libical/icalcomponent.c
   xfcalendar/trunk/libical/src/libicalss/icalmessage.c
   xfcalendar/trunk/src/ical-code.c
Log:
fix for bug 1900:
More 64 bit 0/NULL  usage issues.


Modified: xfcalendar/trunk/libical/src/libical/icalcomponent.c
===================================================================
--- xfcalendar/trunk/libical/src/libical/icalcomponent.c        2006-08-13 
14:27:01 UTC (rev 22744)
+++ xfcalendar/trunk/libical/src/libical/icalcomponent.c        2006-08-13 
15:32:21 UTC (rev 22745)
@@ -96,7 +96,7 @@
 {
     void* vp;
     
-    while((vp = va_arg(args, void*)) != 0) {
+    while((vp = va_arg(args, void*)) != NULL) {
 
        assert (icalcomponent_isa_component(vp) != 0 ||
                icalproperty_isa_property(vp) != 0 ) ;
@@ -155,8 +155,8 @@
 
    icalcomponent *impl = icalcomponent_new_impl(kind);
 
-    if (impl == 0){
-       return 0;
+    if (impl == NULL){
+       return NULL;
     }
 
    va_start(args,kind);
@@ -377,7 +377,7 @@
 
 
 int
-icalcomponent_isa_component (void* component)
+icalcomponent_isa_component (icalcomponent* component)
 {
     icalcomponent *impl = component;
 

Modified: xfcalendar/trunk/libical/src/libicalss/icalmessage.c
===================================================================
--- xfcalendar/trunk/libical/src/libicalss/icalmessage.c        2006-08-13 
14:27:01 UTC (rev 22744)
+++ xfcalendar/trunk/libical/src/libicalss/icalmessage.c        2006-08-13 
15:32:21 UTC (rev 22745)
@@ -123,8 +123,8 @@
        icalcomponent_vanew(
            ICAL_VEVENT_COMPONENT,
            icalproperty_new_dtstamp(icaltime_from_timet(time(0),0)),
-           0),
-       0);
+           NULL),
+       NULL);
 
     icalcomponent *inner = icalmessage_get_inner(reply);
 

Modified: xfcalendar/trunk/src/ical-code.c
===================================================================
--- xfcalendar/trunk/src/ical-code.c    2006-08-13 14:27:01 UTC (rev 22744)
+++ xfcalendar/trunk/src/ical-code.c    2006-08-13 15:32:21 UTC (rev 22745)
@@ -629,7 +629,7 @@
             *p_ical = icalcomponent_vanew(ICAL_VCALENDAR_COMPONENT
                    , icalproperty_new_version("2.0")
                    , icalproperty_new_prodid("-//Xfce//Orage//EN")
-                   , 0);
+                   , NULL);
             xfical_add_timezone(*p_ical, *p_fical, 
local_icaltimezone_location);
             icalset_add_component(*p_fical, *p_ical);
             /*
@@ -1182,7 +1182,7 @@
     ialarm = icalcomponent_vanew(ICAL_VALARM_COMPONENT
         , icalproperty_new_action(ICAL_ACTION_DISPLAY)
         , icalproperty_new_trigger(trg)
-        , 0);
+        , NULL);
     if XFICAL_STR_EXISTS(appt->note)
         icalcomponent_add_property(ialarm
             , icalproperty_new_description(appt->note));
@@ -1198,7 +1198,7 @@
         ialarm = icalcomponent_vanew(ICAL_VALARM_COMPONENT
             , icalproperty_new_action(ICAL_ACTION_AUDIO)
             , icalproperty_new_trigger(trg)
-            , 0);
+            , NULL);
         attach = icalattach_new_from_url(appt->sound);
         icalcomponent_add_property(ialarm
             , icalproperty_new_attach(attach));

_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits