[gimp-perl] Fix return-value bug in register.
- From: Ed J <edj src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp-perl] Fix return-value bug in register.
- Date: Tue, 29 Apr 2014 15:00:48 +0000 (UTC)
commit 3e2c77fadc617299fd4842470929e51803807c16
Author: Ed J <edj src gnome org>
Date: Tue Apr 29 15:54:29 2014 +0100
Fix return-value bug in register.
Gimp/Fu.pm | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/Gimp/Fu.pm b/Gimp/Fu.pm
index c408005..90110ac 100644
--- a/Gimp/Fu.pm
+++ b/Gimp/Fu.pm
@@ -278,9 +278,14 @@ sub getpod ($$) {
# inserts type after imagetypes
sub fixup_args {
my @p = @_;
- splice @p, 9, 0, [] if @p == 10; # optional return values
- die __"register called with too many or wrong arguments\n" unless @p == 11;
my $pod;
+ splice @p, 9, 0, [ eval (getpod($pod, 'RETURN VALUES') // '') ] if @p == 10;
+ die $@ if $@;
+ croak sprintf
+ __"register called with too many or wrong arguments: wanted 11, got %d(%s)",
+ scalar(@p),
+ join(' ', @p),
+ unless @p == 11;
@p[0,1] = (getpod($pod,'NAME')//'') =~ /(.*?)\s*-\s*(.*)/ unless $p[0] or $p[1];
($p[0]) = File::Basename::fileparse($RealScript, qr/\.[^.]*/) unless $p[0];
while (my ($k, $v) = each %IND2SECT) { $p[$k] ||= getpod($pod, $v); }
@@ -288,10 +293,6 @@ sub fixup_args {
eval "package main;\n#line 0 \"$0 PARAMETERS\"\n".
(getpod($pod, 'PARAMETERS') // '')
]; die $@ if $@;
- $p[9] ||= [
- eval "package main;\n#line 0 \"$0 RETURN VALUES\"\n".
- (getpod($pod, 'RETURN VALUES') // '')
- ]; die $@ if $@;
for my $i (0..6, 10) {
croak "$0: Need arg $i (or POD ".($IND2SECT{$i}//'')." section)" unless $p[$i]
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]