diff options
author | Michele Calgaro <[email protected]> | 2018-07-25 19:52:48 +0900 |
---|---|---|
committer | Michele Calgaro <[email protected]> | 2018-07-25 20:14:43 +0900 |
commit | e436f535b680d9ca50cf24f0334c8643956dc132 (patch) | |
tree | 77f131d33985ab8314313c39259ac76e18ccd7bb | |
parent | 0066e3149204abc023fa441d0982c26c8b48ba3c (diff) | |
download | tdebase-e436f535b680d9ca50cf24f0334c8643956dc132.tar.gz tdebase-e436f535b680d9ca50cf24f0334c8643956dc132.zip |
tdeioslave: fixed info protocol, which was no longer working with recent
perl version.
Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit cb350ca23009ebd32397638c9b55766239cf3fc1)
-rwxr-xr-x | tdeioslave/info/kde-info2html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tdeioslave/info/kde-info2html b/tdeioslave/info/kde-info2html index 9ecebfb6d..fb7f9f26c 100755 --- a/tdeioslave/info/kde-info2html +++ b/tdeioslave/info/kde-info2html @@ -151,7 +151,7 @@ sub FileNotFound { next if $looking && !/\* Menu/; $looking = 0; my @item = &ParseMenuItem($_,'dir'); - if (!defined(@item)) { next } + if (!@item) { next } my ($MenuLinkTag, $MenuLinkFile, $MenuLinkRef, $MenuLinkText) = @item; if ($MenuLinkRef eq $FileName) { &Redirect($MenuLinkFile, $MenuLinkTag); @@ -406,7 +406,7 @@ sub ParseMenuItem { sub MenuItem2HTML { my ($Line, $BaseInfoFile) = @_; my @parse_results = &ParseMenuItem($Line, $BaseInfoFile); - if (!defined (@parse_results)) { return $Line; } + if (!@parse_results) { return $Line; } my ($MenuLinkTag, $MenuLinkFile, $MenuLinkRef, $MenuLinkText) = @parse_results; #-- produce a HTML line return "<tr class=\"infomenutr\"><td class=\"infomenutd\" width=\"30%\"><ul><li><a href=\"info:/$MenuLinkFile/$MenuLinkTag\">$MenuLinkRef</a></ul></td><td class=\"infomenutd\">$MenuLinkText"; @@ -959,7 +959,7 @@ sub GetFileAndOffset { # lpc (16 March 2003) &ReadTagTable($BaseInfoFile, \%TagList, \$Exists, \$IsIndirect); return "", 0 unless $Exists; #-- no tag table available - return "", 0 unless defined $TagList{$NodeName}; #-- tag is not in the tag table + return "", 0 unless $TagList{$NodeName}; #-- tag is not in the tag table ($File, $Offset) = split(/#/, $TagList{$NodeName}); return $File, &max($Offset - 100, 0) if $File; #-- there is an explicite #-- not in the tag table |