Item1518: "return" statement with explicit "undef". See page 199 of PBP.

git-svn-id: http://svn.foswiki.org/trunk@3945 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · May 20, 2009 · b81b96e · b81b96e
1 parent 7970b4b
commit b81b96e
Show file tree

Hide file tree

Showing 49 changed files with 108 additions and 108 deletions.
diff --git a/MailerContrib/lib/Foswiki/Contrib/MailerContrib/Subscriber.pm b/MailerContrib/lib/Foswiki/Contrib/MailerContrib/Subscriber.pm
@@ -235,7 +235,7 @@ sub isSubscribedTo {
         }
     }
 
-    return undef;
+    return;
 }
 
 =pod
@@ -256,7 +256,7 @@ sub isUnsubscribedFrom {
         }
     }
 
-    return undef;
+    return;
 }
 
 =pod

diff --git a/PreferencesPlugin/lib/Foswiki/Plugins/PreferencesPlugin.pm b/PreferencesPlugin/lib/Foswiki/Plugins/PreferencesPlugin.pm
@@ -153,7 +153,7 @@ sub _getField {
             return $f;
         }
     }
-    return undef;
+    return;
 }
 
 # Generate a field suitable for editing this type. Use of the core

diff --git a/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin.pm b/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin.pm
@@ -449,7 +449,7 @@ sub postConvertURL {
 sub _convertImage {
     my ( $src, $opts ) = @_;
 
-    return undef unless $src;
+    return unless $src;
 
     local $recursionBlock = 1;    # block calls to beforeCommonTagshandler
 
@@ -734,7 +734,7 @@ sub _restTML2HTML {
 
     returnRESTResult( $response, 200, $html );
 
-    return undef;    # to prevent further processing
+    return;    # to prevent further processing
 }
 
 # Rest handler for use from Javascript
@@ -762,7 +762,7 @@ sub _restHTML2TML {
     );
 
     returnRESTResult( $response, 200, $tml );
-    return undef;    # to prevent further processing
+    return;    # to prevent further processing
 }
 
 # SMELL: foswiki supports proper REST usage of the upload script,
@@ -773,7 +773,7 @@ sub _restUpload {
     # Item1458 ignore uploads not using POST
     if ($query && $query->method() && uc($query->method()) ne 'POST') {
         returnRESTResult($response, 405, "Method not Allowed");
-        return undef;
+        return;
     }
     my ( $web, $topic ) =
       Foswiki::Func::normalizeWebTopicName( undef, $query->param('topic') );
@@ -783,7 +783,7 @@ sub _restUpload {
         \&Foswiki::Sandbox::validateTopicName );
     unless ( defined $web && defined $topic ) {
         returnRESTResult( $response, 401, "Access denied" );
-        return undef;    # to prevent further processing
+        return;    # to prevent further processing
     }
     my $hideFile    = $query->param('hidefile')    || '';
     my $fileComment = $query->param('filecomment') || '';
@@ -809,7 +809,7 @@ sub _restUpload {
       )
     {
         returnRESTResult( $response, 401, "Access denied" );
-        return undef;    # to prevent further processing
+        return;    # to prevent further processing
     }
 
     my ( $fileSize, $fileDate, $tmpFileName );
@@ -832,15 +832,15 @@ sub _restUpload {
 
         unless ( $fileSize && $fileName ) {
             returnRESTResult( $response, 500, "Zero-sized file upload" );
-            return undef;    # to prevent further processing
+            return;    # to prevent further processing
         }
 
         my $maxSize = Foswiki::Func::getPreferencesValue('ATTACHFILESIZELIMIT');
         $maxSize = 0 unless ( $maxSize =~ /([0-9]+)/o );
 
         if ( $maxSize && $fileSize > $maxSize * 1024 ) {
             returnRESTResult( $response, 500, "OVERSIZED UPLOAD" );
-            return undef;    # to prevent further processing
+            return;    # to prevent further processing
         }
     }
 
@@ -866,7 +866,7 @@ sub _restUpload {
 
     if ($error) {
         returnRESTResult( $response, 500, $error );
-        return undef;    # to prevent further processing
+        return;    # to prevent further processing
     }
 
     # Otherwise allow the rest dispatcher to write a 200
@@ -904,7 +904,7 @@ sub _restAttachments {
       )
     {
         returnRESTResult( $response, 401, "Access denied" );
-        return undef;    # to prevent further processing
+        return;    # to prevent further processing
     }
 
     # Create a JSON list of attachment data, sorted by name

diff --git a/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/HTML2TML/Node.pm b/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/HTML2TML/Node.pm
@@ -1022,12 +1022,12 @@ sub isBlockNode {
 sub previousLeaf {
     my $node = shift;
     if ( !$node ) {
-        return undef;
+        return;
     }
     do {
         while ( !$node->{prev} ) {
             if ( !$node->{parent} ) {
-                return undef;    # can't go any further back
+                return;    # can't go any further back
             }
             $node = $node->{parent};
         }
@@ -1052,7 +1052,7 @@ sub _checkBeforeEmphasis {
 sub nextLeaf {
     my $node = shift;
     if ( !$node ) {
-        return undef;
+        return;
     }
     do {
         while ( !$node->{next} ) {

diff --git a/core/bin/configure b/core/bin/configure
@@ -277,7 +277,7 @@ sub findFileOnPath {
             return "$dir/$file";
         }
     }
-    return undef;
+    return;
 }
 
 ###########################################################

diff --git a/core/lib/Assert.pm b/core/lib/Assert.pm
@@ -63,7 +63,7 @@ sub ASSERT ($;$) {
         $msg .= " failed!\n";
         Carp::confess($msg);
     }
-    return undef;
+    return;
 }
 
 # Test if a value is untainted

diff --git a/core/lib/CPAN/lib/Algorithm/Diff.pm b/core/lib/CPAN/lib/Algorithm/Diff.pm
@@ -88,7 +88,7 @@ sub _replaceNextLargerWith
 
         if ( $aValue == $found )
         {
-            return undef;
+            return;
         }
         elsif ( $aValue > $found )
         {

diff --git a/core/lib/CPAN/lib/CGI/Session.pm b/core/lib/CPAN/lib/CGI/Session.pm
@@ -288,7 +288,7 @@ sub param {
         if ($name =~ m/^_SESSION_/) {
 
             carp "param(): attempt to write to private parameter";
-            return undef;
+            return;
         }
         $self->_set_status( STATUS_MODIFIED );
         return $self->{_DATA}->{ $name } = $value;
@@ -699,7 +699,7 @@ sub load {
     $self->_load_pluggables();
 
     # Did load_pluggable fail? If so, return undef, just like $class->set_error() would
-    return undef if $class->errstr;
+    return if $class->errstr;
 
     if (not defined $self->{_CLAIMED_ID}) {
         my $query = $self->query();

diff --git a/core/lib/Foswiki.pm b/core/lib/Foswiki.pm
@@ -508,7 +508,7 @@ sub UTF82SiteCharSet {
     return $text unless ( defined $Foswiki::cfg{Site}{CharSet} );
 
     # Detect character encoding of the full topic name from URL
-    return undef if ( $text =~ $regex{validAsciiStringRegex} );
+    return if ( $text =~ $regex{validAsciiStringRegex} );
 
     # SMELL: all this regex stuff should go away.
     # If not UTF-8 - assume in site character set, no conversion required
@@ -523,7 +523,7 @@ sub UTF82SiteCharSet {
     else {
 
         #SMELL: this seg faults on OSX leopard. (and possibly others)
-        return undef unless ( $text =~ $regex{validUtf8StringRegex} );
+        return unless ( $text =~ $regex{validUtf8StringRegex} );
     }
 
     # If site charset is already UTF-8, there is no need to convert anything:
@@ -2687,7 +2687,7 @@ sub _expandMacroOnTopicCreation {
     # This is what we want to make sure new user templates are populated
     # correctly, but you need to think about this if you extend the set of
     # tags expanded here.
-    return undef
+    return
       unless $_[0] =~
 /^(URLPARAM|DATE|(SERVER|GM)TIME|(USER|WIKI)NAME|WIKIUSERNAME|USERINFO)$/;
 

diff --git a/core/lib/Foswiki/Configure/Checkers/BasicSanity.pm b/core/lib/Foswiki/Configure/Checkers/BasicSanity.pm
@@ -141,7 +141,7 @@ HERE
 sub _copy {
     my $n = shift;
 
-    return undef unless defined($n);
+    return unless defined($n);
 
     if ( UNIVERSAL::isa( $n, 'ARRAY' ) ) {
         my @new;

diff --git a/core/lib/Foswiki/Configure/FoswikiCfg.pm b/core/lib/Foswiki/Configure/FoswikiCfg.pm
@@ -122,7 +122,7 @@ sub _loadSpecsFrom {
         return $this;
     }
 
-    sub getValueObject { return undef; }
+    sub getValueObject { return; }
 }
 
 # Process the config array and add section objects
@@ -179,7 +179,7 @@ sub _getValueObject {
         my $i = $item->getValueObject($keys);
         return $i if $i;
     }
-    return undef;
+    return;
 }
 
 # Parse the config declaration file and return a root node for the

diff --git a/core/lib/Foswiki/Configure/Item.pm b/core/lib/Foswiki/Configure/Item.pm
@@ -73,11 +73,11 @@ sub inc {
 }
 
 sub getSectionObject {
-    return undef;
+    return;
 }
 
 sub getValueObject {
-    return undef;
+    return;
 }
 
 1;

diff --git a/core/lib/Foswiki/Configure/Section.pm b/core/lib/Foswiki/Configure/Section.pm
@@ -78,7 +78,7 @@ sub getSectionObject {
         my $cvo = $child->getSectionObject( $head, $depth );
         return $cvo if $cvo;
     }
-    return undef;
+    return;
 }
 
 # Get the value object associated with the given keys
@@ -88,7 +88,7 @@ sub getValueObject {
         my $cvo = $child->getValueObject($keys);
         return $cvo if $cvo;
     }
-    return undef;
+    return;
 }
 
 # See if this section is changed from the default values. Should

diff --git a/core/lib/Foswiki/Configure/UI.pm b/core/lib/Foswiki/Configure/UI.pm
@@ -57,7 +57,7 @@ sub getRepository {
     foreach my $place ( @{ $this->{repositories} } ) {
         return $place if $place->{name} eq $reponame;
     }
-    return undef;
+    return;
 }
 
 # Static UI factory
@@ -69,7 +69,7 @@ sub loadUI {
 
     eval "use $id; \$ui = new $id(\$item);";
 
-    return undef if ( !$ui && $@ );
+    return if ( !$ui && $@ );
 
     return $ui;
 }

diff --git a/core/lib/Foswiki/Configure/UIs/EXTENSIONS.pm b/core/lib/Foswiki/Configure/UIs/EXTENSIONS.pm
@@ -260,7 +260,7 @@ sub _getInstalledVersion {
     my ( $this, $module ) = @_;
     my $lib;
 
-    return undef unless $module;
+    return unless $module;
 
     if ( $module =~ /Plugin$/ ) {
         $lib = 'Plugins';

diff --git a/core/lib/Foswiki/Configure/Value.pm b/core/lib/Foswiki/Configure/Value.pm
@@ -63,7 +63,7 @@ sub getValueObject {
     my ( $this, $keys ) = @_;
 
     return $this if ( $this->{keys} && $keys eq $this->{keys} );
-    return undef;
+    return;
 }
 
 # See if this value is changed from the default. The comparison

diff --git a/core/lib/Foswiki/Form.pm b/core/lib/Foswiki/Form.pm
@@ -77,15 +77,15 @@ sub new {
       Foswiki::Sandbox::untaint( $form, \&Foswiki::Sandbox::validateTopicName );
 
     unless ( $web && $form ) {
-        return undef;
+        return;
     }
 
     my $this = $session->{forms}->{"$web.$form"};
     unless ($this) {
 
         # Got to have either a def or a topic
         unless ( $def || $session->topicExists( $web, $form ) ) {
-            return undef;
+            return;
         }
 
         $this = $class->SUPER::new( $session, $web, $form );
@@ -516,7 +516,7 @@ sub getField {
     foreach my $fieldDef ( @{ $this->{fields} } ) {
         return $fieldDef if ( $fieldDef->{name} && $fieldDef->{name} eq $name );
     }
-    return undef;
+    return;
 }
 
 =begin TML

diff --git a/core/lib/Foswiki/Func.pm b/core/lib/Foswiki/Func.pm
@@ -663,10 +663,10 @@ sub wikiToUserName {
     my $cUID = getCanonicalUserID($wiki);
     if ($cUID) {
         my $login = $Foswiki::Plugins::SESSION->{users}->getLoginName($cUID);
-        return undef if !$login || $login eq 'unknown';
+        return if !$login || $login eq 'unknown';
         return $login;
     }
-    return undef;
+    return;
 }
 
 =begin TML
@@ -942,7 +942,7 @@ Use it as follows:
 sub eachGroupMember {
     my $user    = shift;
     my $session = $Foswiki::Plugins::SESSION;
-    return undef
+    return
       unless $Foswiki::Plugins::SESSION->{users}->isGroup($user);
     my $it = $Foswiki::Plugins::SESSION->{users}->eachGroupMember($user);
     $it->{process} = sub {

diff --git a/core/lib/Foswiki/I18N.pm b/core/lib/Foswiki/I18N.pm
@@ -382,7 +382,7 @@ sub fromSiteCharSet {
                   . $Foswiki::cfg{Site}{CharSet}
                   . '" not supported, or name not recognised - check '
                   . '"perldoc Encode::Supported"' );
-            return undef;
+            return;
         }
         else {
             my $octets =

diff --git a/core/lib/Foswiki/I18N/Extract.pm b/core/lib/Foswiki/I18N/Extract.pm
@@ -42,7 +42,7 @@ sub new {
 
     if (defined $initError) {
         $session->logger->log( 'warning', $initError ) if $session;
-        return undef;
+        return;
     }
 
     my $self = new Locale::Maketext::Extract;

diff --git a/core/lib/Foswiki/Iterator/FilterIterator.pm b/core/lib/Foswiki/Iterator/FilterIterator.pm
@@ -57,7 +57,7 @@ sub hasNext {
 # See Foswiki::Iterator for a description of the general iterator contract
 sub next {
     my $this = shift;
-    return undef unless $this->hasNext();
+    return unless $this->hasNext();
     $this->{pending} = 0;
     return $this->{next};
 }