aboutsummaryrefslogtreecommitdiffstats
path: root/libical/scripts/mkderivedvalues.pl
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@src.gnome.org>2000-12-12 07:01:26 +0800
committerFederico Mena Quintero <federico@src.gnome.org>2000-12-12 07:01:26 +0800
commit26eee7328031f78b063ab71265ef4fddc8619c72 (patch)
tree65334073d42b48a4c23f2d7d20a6813c2113f57c /libical/scripts/mkderivedvalues.pl
parent5ccacd6a5bbeb2d91aea706f37cc5f96ee3144fb (diff)
downloadgsoc2013-evolution-26eee7328031f78b063ab71265ef4fddc8619c72.tar
gsoc2013-evolution-26eee7328031f78b063ab71265ef4fddc8619c72.tar.gz
gsoc2013-evolution-26eee7328031f78b063ab71265ef4fddc8619c72.tar.bz2
gsoc2013-evolution-26eee7328031f78b063ab71265ef4fddc8619c72.tar.lz
gsoc2013-evolution-26eee7328031f78b063ab71265ef4fddc8619c72.tar.xz
gsoc2013-evolution-26eee7328031f78b063ab71265ef4fddc8619c72.tar.zst
gsoc2013-evolution-26eee7328031f78b063ab71265ef4fddc8619c72.zip
Fix fucking CVS conflicts because fucking CVS is a fucking big doofus - Federico
svn path=/trunk/; revision=6920
Diffstat (limited to 'libical/scripts/mkderivedvalues.pl')
-rwxr-xr-xlibical/scripts/mkderivedvalues.pl13
1 files changed, 7 insertions, 6 deletions
diff --git a/libical/scripts/mkderivedvalues.pl b/libical/scripts/mkderivedvalues.pl
index 103c54a8e2..a04928ab59 100755
--- a/libical/scripts/mkderivedvalues.pl
+++ b/libical/scripts/mkderivedvalues.pl
@@ -128,6 +128,7 @@ while(<F>)
my @v = split(/\t+/,$_);
my $value = shift @v;
+ my $mode = shift @v;
my $type = shift @v;
my $comment = join(" ",@v);
@@ -155,7 +156,7 @@ while(<F>)
$union_data = $lc;
}
- if ($opt_c) {
+ if ($opt_c && $mode eq "std") {
print <<EOM;
icalvalue*
@@ -182,7 +183,7 @@ icalvalue_set_${lc}(icalvalue* value, $type v)
EOM
if( ${union_data} eq 'string'){
-print" if(impl->data.v_${union_data}!=0) {free(impl->data.v_${union_data});}\n";
+print" if(impl->data.v_${union_data}!=0) {free((void*)impl->data.v_${union_data});}\n";
}
print <<EOM;
@@ -216,15 +217,15 @@ EOM
if ( $ud{$union_data}++ == 0) {
print<<EOM;
-char* icalvalue_${union_data}_as_ical_string(icalvalue* value) {
+const char* icalvalue_${union_data}_as_ical_string(icalvalue* value) {
$type data;
char temp[1024];
char *str;
- icalerror_check_arg( (value!=0),"value");
+ icalerror_check_airg( (value!=0),"value");
data = ((struct icalvalue_impl*)value)->data.v_${union_data}
- str = strdup(temp);
+ str = icalmemory_strdup(temp);
return str;
}
@@ -306,7 +307,7 @@ if ($opt_p)
if ($opt_h){
print <<EOM;
-#endif ICALVALUE_H
+#endif /*ICALVALUE_H*/
EOM
}