# HG changeset patch # User kono # Date 1043471972 -32400 # Node ID d3e2e1d1a16c3fa16777b93aa09f38a9bb827aa0 # Parent cb79baed256e6dfd6a3b6a3ba4a9fca7710ef45a fix various warinings ( mostly uninitialized value) diff -r cb79baed256e -r d3e2e1d1a16c Calcon.pm --- a/Calcon.pm Sat Jan 25 12:43:45 2003 +0900 +++ b/Calcon.pm Sat Jan 25 14:19:32 2003 +0900 @@ -4,7 +4,7 @@ use 5.008; use strict; -# use warnings; +# use warnings; we have -w, so why we need this? #require Exporter; @@ -89,6 +89,7 @@ sub option { my ($self,$option) = @_; + return if (! defined($option)); foreach my $opt ( $option =~ /./g ) { if ($opt eq '-') { } elsif ($opt eq 'n') { @@ -466,6 +467,7 @@ sub add { my ($self,$add) = @_; my ($result); + return $self if (!defined($add)); $result = $$self + $add; bless \$result; } @@ -536,6 +538,12 @@ # print ">**$record->{'end-date'}***\n"; # print ">**$record->{'time'}***\n"; # print ">**$record->{'end-time'}***\n"; + # warning killer + if (! defined($record->{'date'})) { $record->{'date'} = '';} + if (! defined($record->{'time'})) { $record->{'time'} = '';} + if (! defined($record->{'end-time'})) { $record->{'end-time'} = '';} + if (! defined($record->{'end-date'})) { $record->{'end-date'} = '';} + $sday = $eday = $stime = $etime = ''; if ($record->{'time'} =~ /(\d+:\d+)\s*-\s*(\d+:\d+)/) { $stime = $1; $etime = $2; @@ -1407,8 +1415,8 @@ sub end_file { my ($self) = @_; - $self->write_datebook() if ( $self->{'-date-max'} > 0); - $self->write_addressbook() if ( $self->{'-adr-max'} > 0); + $self->write_datebook() if ( defined($self->{'-date-max'})); + $self->write_addressbook() if ( defined($self->{'-adr-max'})); } sub write_datebook { @@ -2664,6 +2672,9 @@ $dates->{'date'} = $self->unix_time($dates->{'date'}); $dates->{'end-date'} = $self->unix_time($dates->{'end-date'}) } + # warning killer + if (! defined($dates->{'summary'})) { $dates->{'summary'} = '';}; + if (! defined($dates->{'memo'})) { $dates->{'memo'} = '';}; $dates->{'memo'} = nkf('-w -Z3',$dates->{'summary'}.$dates->{'memo'}); my $memo = $dates->{'memo'}; @@ -2699,9 +2710,7 @@ for my $adr ( @{$self->{'-address-records'}} ) { if (defined $adr->{'birth'}){ - $adr->{'birth'} = $self->birth_date($adr->{'birth'}) ;} - foreach my $key ( keys %$adr ) { - $adr->{$adr} = nkf('-w -Z3',$adr->{$adr}); + $adr->{'birth'} = $self->birth_date($adr->{'birth'}) ; } my ($address) = $adr->{'address'}; @@ -2775,7 +2784,7 @@ sub print { my ($self,@data) = @_; - print CAL nkf("--utf8",@data); + print CAL nkf("--utf8 -Z3",@data); } #######################################################################/ @@ -3314,8 +3323,10 @@ sub open { my ($self,$date) = @_; - my $name = $self->{'-directory'}."/". - $date->xcalendar_file_name; + my $name = $date->xcalendar_file_name; + if (defined($self->{'-directory'})) { + $name = $self->{'-directory'}."/".$name; + } open(OUT,">>".$name); select OUT; }