[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-pim
Subject:    [Kde-pim] Use of malloc.h in libical
From:       Andy Fawcett <andy () athame ! co ! uk>
Date:       2002-11-28 20:07:43
[Download RAW message or body]

Hi,

As discussed on kde-core-devel last week, there are some occurrences of:

#include <malloc.h>

in libical.

Use of this header is now prohibited in FreeBSD 5.0 (it's been obsoleted 
for years now), and these should be changed to <stdlib.h>

In my local copy, I changed the three occurrences:

libical/src/libical/icallangbind.c
libical/src/libicalvcal/vcc.y
libical/src/libicalvcal/vobject.c

After doing these, I built fine.

I was about to commit, so did a "cvs up" in the libical directory, and 
it gave me:

M src/libical/icallangbind.c
M src/libical/icalrestriction.c
M src/libicalvcal/vcc.y
M src/libicalvcal/vobject.c

The second of those has confused me, as I've made no changes to that 
file. Is it auto generated dependent on my other changes, and if so 
should I also commit that file?

I've attached the diff of that file.

Any hints or advice, before I commit?

Cheers,

Andy

-- 
Andy Fawcett      |   "In an open world without walls and fences,
andy@athame.co.uk |      we wouldn't need Windows and Gates."
tap@lspace.org    |                              -- anon

["icalrestriction.c.diff" (text/x-diff)]

Index: src/libical/icalrestriction.c
===================================================================
RCS file: /home/kde/kdepim/libical/src/libical/icalrestriction.c,v
retrieving revision 1.4
diff -u -3 -p -r1.4 icalrestriction.c
--- src/libical/icalrestriction.c	2001/03/27 09:34:37	1.4
+++ src/libical/icalrestriction.c	2002/11/28 20:06:16
@@ -744,7 +744,7 @@ icalrestriction_property_record icalrest
     {ICAL_METHOD_REPLY,ICAL_VFREEBUSY_COMPONENT,ICAL_DURATION_PROPERTY,ICAL_RESTRICTION_ZERO,0},
     {ICAL_METHOD_REPLY,ICAL_VFREEBUSY_COMPONENT,ICAL_SEQUENCE_PROPERTY,ICAL_RESTRICTION_ZERO,0},
     {ICAL_METHOD_PUBLISH,ICAL_VTODO_COMPONENT,ICAL_DTSTAMP_PROPERTY,ICAL_RESTRICTION_ONE,0},
-    {ICAL_METHOD_PUBLISH,ICAL_VTODO_COMPONENT,ICAL_DTSTART_PROPERTY,ICAL_RESTRICTION_ONE,0},
+    {ICAL_METHOD_PUBLISH,ICAL_VTODO_COMPONENT,ICAL_DTSTART_PROPERTY,ICAL_RESTRICTION_ZEROORONE,0},
     {ICAL_METHOD_PUBLISH,ICAL_VTODO_COMPONENT,ICAL_ORGANIZER_PROPERTY,ICAL_RESTRICTION_ONE,0},
     {ICAL_METHOD_PUBLISH,ICAL_VTODO_COMPONENT,ICAL_PRIORITY_PROPERTY,ICAL_RESTRICTION_ONE,0},
     {ICAL_METHOD_PUBLISH,ICAL_VTODO_COMPONENT,ICAL_SEQUENCE_PROPERTY,ICAL_RESTRICTION_ZEROORONE,0},
@@ -777,7 +777,7 @@ icalrestriction_property_record icalrest
     {ICAL_METHOD_PUBLISH,ICAL_VTODO_COMPONENT,ICAL_REQUESTSTATUS_PROPERTY,ICAL_RESTRICTION_ZERO,0},
     {ICAL_METHOD_REQUEST,ICAL_VTODO_COMPONENT,ICAL_ATTENDEE_PROPERTY,ICAL_RESTRICTION_ONEPLUS,0},
     {ICAL_METHOD_REQUEST,ICAL_VTODO_COMPONENT,ICAL_DTSTAMP_PROPERTY,ICAL_RESTRICTION_ONE,0},
-    {ICAL_METHOD_REQUEST,ICAL_VTODO_COMPONENT,ICAL_DTSTART_PROPERTY,ICAL_RESTRICTION_ONE,0},
+    {ICAL_METHOD_REQUEST,ICAL_VTODO_COMPONENT,ICAL_DTSTART_PROPERTY,ICAL_RESTRICTION_ZEROORONE,0},
     {ICAL_METHOD_REQUEST,ICAL_VTODO_COMPONENT,ICAL_ORGANIZER_PROPERTY,ICAL_RESTRICTION_ONE,0},
     {ICAL_METHOD_REQUEST,ICAL_VTODO_COMPONENT,ICAL_PRIORITY_PROPERTY,ICAL_RESTRICTION_ONE,0},
     {ICAL_METHOD_REQUEST,ICAL_VTODO_COMPONENT,ICAL_SEQUENCE_PROPERTY,ICAL_RESTRICTION_ZEROORONE,0},

_______________________________________________
kde-pim mailing list
kde-pim@mail.kde.org
http://mail.kde.org/mailman/listinfo/kde-pim
kde-pim home page at http://pim.kde.org/

[prev in list] [next in list] [prev in thread] [next in thread]