Run pgindent on 9.2 source tree in preparation for first 9.3

commit-fest.

1 files changed, 304 insertions, 303 deletions

diff --git a/src/tools/msvc/Project.pm b/src/tools/msvc/Project.pm
index 98db076e58c..53cfdb17538 100644
--- a/src/tools/msvc/Project.pm
+++ b/src/tools/msvc/Project.pm
@@ -12,393 +12,394 @@ use File::Basename;
 
 sub _new
 {
-    my ($classname, $name, $type, $solution) = @_;
-    my $good_types = {
-        lib => 1,
-        exe => 1,
-        dll => 1,
-    };
-    confess("Bad project type: $type\n") unless exists $good_types->{$type};
-    my $self = {
-        name                  => $name,
-        type                  => $type,
-        guid                  => Win32::GuidGen(),
-        files                 => {},
-        references            => [],
-        libraries             => [],
-        suffixlib             => [],
-        includes              => '',
-        prefixincludes        => '',
-        defines               => ';',
-        solution              => $solution,
-        disablewarnings       => '4018;4244;4273;4102;4090;4267',
-        disablelinkerwarnings => '',
-        platform              => $solution->{platform},
-    };
-
-    bless($self, $classname);
-    return $self;
+	my ($classname, $name, $type, $solution) = @_;
+	my $good_types = {
+		lib => 1,
+		exe => 1,
+		dll => 1,
+	};
+	confess("Bad project type: $type\n") unless exists $good_types->{$type};
+	my $self = {
+		name                  => $name,
+		type                  => $type,
+		guid                  => Win32::GuidGen(),
+		files                 => {},
+		references            => [],
+		libraries             => [],
+		suffixlib             => [],
+		includes              => '',
+		prefixincludes        => '',
+		defines               => ';',
+		solution              => $solution,
+		disablewarnings       => '4018;4244;4273;4102;4090;4267',
+		disablelinkerwarnings => '',
+		platform              => $solution->{platform},
+	};
+
+	bless($self, $classname);
+	return $self;
 }
 
 sub AddFile
 {
-    my ($self, $filename) = @_;
+	my ($self, $filename) = @_;
 
-    $self->{files}->{$filename} = 1;
+	$self->{files}->{$filename} = 1;
 }
 
 sub AddFiles
 {
-    my $self = shift;
-    my $dir = shift;
+	my $self = shift;
+	my $dir = shift;
 
-    while (my $f = shift)
-    {
-        $self->{files}->{$dir . "\\" . $f} = 1;
-    }
+	while (my $f = shift)
+	{
+		$self->{files}->{$dir . "\\" . $f} = 1;
+	}
 }
 
 sub ReplaceFile
 {
-    my ($self, $filename, $newname) = @_;
-    my $re = "\\\\$filename\$";
-
-    foreach my $file ( keys %{ $self->{files} } )
-    {
-
-        # Match complete filename
-        if ($filename =~ /\\/)
-        {
-            if ($file eq $filename)
-            {
-                delete $self->{files}{$file};
-                $self->{files}{$newname} = 1;
-                return;
-            }
-        }
-        elsif ($file =~ m/($re)/)
-        {
-            delete $self->{files}{$file};
-            $self->{files}{"$newname\\$filename"} = 1;
-            return;
-        }
-    }
-    confess("Could not find file $filename to replace\n");
+	my ($self, $filename, $newname) = @_;
+	my $re = "\\\\$filename\$";
+
+	foreach my $file (keys %{$self->{files}})
+	{
+
+		# Match complete filename
+		if ($filename =~ /\\/)
+		{
+			if ($file eq $filename)
+			{
+				delete $self->{files}{$file};
+				$self->{files}{$newname} = 1;
+				return;
+			}
+		}
+		elsif ($file =~ m/($re)/)
+		{
+			delete $self->{files}{$file};
+			$self->{files}{"$newname\\$filename"} = 1;
+			return;
+		}
+	}
+	confess("Could not find file $filename to replace\n");
 }
 
 sub RemoveFile
 {
-    my ($self, $filename) = @_;
-    my $orig = scalar keys %{ $self->{files} };
-    delete $self->{files}->{$filename};
-    if ($orig > scalar keys %{$self->{files}} )
-    {
-        return;
-    }
-    confess("Could not find file $filename to remove\n");
+	my ($self, $filename) = @_;
+	my $orig = scalar keys %{$self->{files}};
+	delete $self->{files}->{$filename};
+	if ($orig > scalar keys %{$self->{files}})
+	{
+		return;
+	}
+	confess("Could not find file $filename to remove\n");
 }
 
 sub RelocateFiles
 {
-    my ($self, $targetdir, $proc) = @_;
-    foreach my $f (keys %{$self->{files}})
-    {
-        my $r = &$proc($f);
-        if ($r)
-        {
-            $self->RemoveFile($f);
-            $self->AddFile($targetdir . '\\' . basename($f));
-        }
-    }
+	my ($self, $targetdir, $proc) = @_;
+	foreach my $f (keys %{$self->{files}})
+	{
+		my $r = &$proc($f);
+		if ($r)
+		{
+			$self->RemoveFile($f);
+			$self->AddFile($targetdir . '\\' . basename($f));
+		}
+	}
 }
 
 sub AddReference
 {
-    my $self = shift;
+	my $self = shift;
 
-    while (my $ref = shift)
-    {
-        push @{$self->{references}},$ref;
-        $self->AddLibrary("__CFGNAME__\\" . $ref->{name} . "\\" . $ref->{name} . ".lib");
-    }
+	while (my $ref = shift)
+	{
+		push @{$self->{references}},$ref;
+		$self->AddLibrary("__CFGNAME__\\" . $ref->{name} . "\\" . $ref->{name} . ".lib");
+	}
 }
 
 sub AddLibrary
 {
-    my ($self, $lib, $dbgsuffix) = @_;
-
-    if ($lib =~ m/\s/)
-    {
-        $lib = '"' . $lib . """;
-    }
-
-    push @{$self->{libraries}}, $lib;
-    if ($dbgsuffix)
-    {
-        push @{$self->{suffixlib}}, $lib;
-    }
+	my ($self, $lib, $dbgsuffix) = @_;
+
+	if ($lib =~ m/\s/)
+	{
+		$lib = '"' . $lib . """;
+	}
+
+	push @{$self->{libraries}}, $lib;
+	if ($dbgsuffix)
+	{
+		push @{$self->{suffixlib}}, $lib;
+	}
 }
 
 sub AddIncludeDir
 {
-    my ($self, $inc) = @_;
+	my ($self, $inc) = @_;
 
-    if ($self->{includes} ne '')
-    {
-        $self->{includes} .= ';';
-    }
-    $self->{includes} .= $inc;
+	if ($self->{includes} ne '')
+	{
+		$self->{includes} .= ';';
+	}
+	$self->{includes} .= $inc;
 }
 
 sub AddPrefixInclude
 {
-    my ($self, $inc) = @_;
+	my ($self, $inc) = @_;
 
-    $self->{prefixincludes} = $inc . ';' . $self->{prefixincludes};
+	$self->{prefixincludes} = $inc . ';' . $self->{prefixincludes};
 }
 
 sub AddDefine
 {
-    my ($self, $def) = @_;
+	my ($self, $def) = @_;
 
-    $def =~ s/"/""/g;
-    $self->{defines} .= $def . ';';
+	$def =~ s/"/""/g;
+	$self->{defines} .= $def . ';';
 }
 
 sub FullExportDLL
 {
-    my ($self, $libname) = @_;
+	my ($self, $libname) = @_;
 
-    $self->{builddef} = 1;
-    $self->{def} = ".\\__CFGNAME__\\$self->{name}\\$self->{name}.def";
-    $self->{implib} = "__CFGNAME__\\$self->{name}\\$libname";
+	$self->{builddef} = 1;
+	$self->{def} = ".\\__CFGNAME__\\$self->{name}\\$self->{name}.def";
+	$self->{implib} = "__CFGNAME__\\$self->{name}\\$libname";
 }
 
 sub UseDef
 {
-    my ($self, $def) = @_;
+	my ($self, $def) = @_;
 
-    $self->{def} = $def;
+	$self->{def} = $def;
 }
 
 sub AddDir
 {
-    my ($self, $reldir) = @_;
-    my $MF;
-
-    my $t = $/;
-    undef $/;
-    open($MF,"$reldir\\Makefile")
-      || open($MF,"$reldir\\GNUMakefile")
-      || croak "Could not open $reldir\\Makefile\n";
-    my $mf = <$MF>;
-    close($MF);
-
-    $mf =~ s{\\\s*[\r\n]+}{}mg;
-    if ($mf =~ m{^(?:SUB)?DIRS[^=]*=\s*(.*)$}mg)
-    {
-        foreach my $subdir (split /\s+/,$1)
-        {
-            next
-              if $subdir eq "\$(top_builddir)/src/timezone"; #special case for non-standard include
-            next
-              if $reldir . "\\" . $subdir eq "src\\backend\\port\\darwin";
-
-            $self->AddDir($reldir . "\\" . $subdir);
-        }
-    }
-    while ($mf =~ m{^(?:EXTRA_)?OBJS[^=]*=\s*(.*)$}m)
-    {
-        my $s = $1;
-        my $filter_re = qr{\$\(filter ([^,]+),\s+\$\(([^\)]+)\)\)};
-        while ($s =~ /$filter_re/)
-        {
-
-            # Process $(filter a b c, $(VAR)) expressions
-            my $list = $1;
-            my $filter = $2;
-            $list =~ s/\.o/\.c/g;
-            my @pieces = split /\s+/, $list;
-            my $matches = "";
-            foreach my $p (@pieces)
-            {
-
-                if ($filter eq "LIBOBJS")
-                {
-                    if (grep(/$p/, @main::pgportfiles) == 1)
-                    {
-                        $p =~ s/\.c/\.o/;
-                        $matches .= $p . " ";
-                    }
-                }
-                else
-                {
-                    confess "Unknown filter $filter\n";
-                }
-            }
-            $s =~ s/$filter_re/$matches/;
-        }
-        foreach my $f (split /\s+/,$s)
-        {
-            next if $f =~ /^\s*$/;
-            next if $f eq "\\";
-            next if $f =~ /\/SUBSYS.o$/;
-            $f =~ s/,$//; # Remove trailing comma that can show up from filter stuff
-            next unless $f =~ /.*\.o$/;
-            $f =~ s/\.o$/\.c/;
-            if ($f =~ /^\$\(top_builddir\)\/(.*)/)
-            {
-                $f = $1;
-                $f =~ s/\//\\/g;
-                $self->{files}->{$f} = 1;
-            }
-            else
-            {
-                $f =~ s/\//\\/g;
-                $self->{files}->{"$reldir\\$f"} = 1;
-            }
-        }
-        $mf =~ s{OBJS[^=]*=\s*(.*)$}{}m;
-    }
-
-    # Match rules that pull in source files from different directories, eg
-    # pgstrcasecmp.c rint.c snprintf.c: % : $(top_srcdir)/src/port/%
-    my $replace_re = qr{^([^:\n\$]+\.c)\s*:\s*(?:%\s*: )?\$(\([^\)]+\))\/(.*)\/[^\/]+$}m;
-    while ($mf =~ m{$replace_re}m)
-    {
-        my $match = $1;
-        my $top = $2;
-        my $target = $3;
-        $target =~ s{/}{\\}g;
-        my @pieces = split /\s+/,$match;
-        foreach my $fn (@pieces)
-        {
-            if ($top eq "(top_srcdir)")
-            {
-                eval { $self->ReplaceFile($fn, $target) };
-            }
-            elsif ($top eq "(backend_src)")
-            {
-                eval { $self->ReplaceFile($fn, "src\\backend\\$target") };
-            }
-            else
-            {
-                confess "Bad replacement top: $top, on line $_\n";
-            }
-        }
-        $mf =~ s{$replace_re}{}m;
-    }
-
-    # See if this Makefile contains a description, and should have a RC file
-    if ($mf =~ /^PGFILEDESC\s*=\s*\"([^\"]+)\"/m)
-    {
-        my $desc = $1;
-        my $ico;
-        if ($mf =~ /^PGAPPICON\s*=\s*(.*)$/m) { $ico = $1; }
-        $self->AddResourceFile($reldir,$desc,$ico);
-    }
-    $/ = $t;
+	my ($self, $reldir) = @_;
+	my $MF;
+
+	my $t = $/;
+	undef $/;
+	open($MF,"$reldir\\Makefile")
+	  || open($MF,"$reldir\\GNUMakefile")
+	  || croak "Could not open $reldir\\Makefile\n";
+	my $mf = <$MF>;
+	close($MF);
+
+	$mf =~ s{\\\s*[\r\n]+}{}mg;
+	if ($mf =~ m{^(?:SUB)?DIRS[^=]*=\s*(.*)$}mg)
+	{
+		foreach my $subdir (split /\s+/,$1)
+		{
+			next
+			  if $subdir eq "\$(top_builddir)/src/timezone"
+			; #special case for non-standard include
+			next
+			  if $reldir . "\\" . $subdir eq "src\\backend\\port\\darwin";
+
+			$self->AddDir($reldir . "\\" . $subdir);
+		}
+	}
+	while ($mf =~ m{^(?:EXTRA_)?OBJS[^=]*=\s*(.*)$}m)
+	{
+		my $s = $1;
+		my $filter_re = qr{\$\(filter ([^,]+),\s+\$\(([^\)]+)\)\)};
+		while ($s =~ /$filter_re/)
+		{
+
+			# Process $(filter a b c, $(VAR)) expressions
+			my $list = $1;
+			my $filter = $2;
+			$list =~ s/\.o/\.c/g;
+			my @pieces = split /\s+/, $list;
+			my $matches = "";
+			foreach my $p (@pieces)
+			{
+
+				if ($filter eq "LIBOBJS")
+				{
+					if (grep(/$p/, @main::pgportfiles) == 1)
+					{
+						$p =~ s/\.c/\.o/;
+						$matches .= $p . " ";
+					}
+				}
+				else
+				{
+					confess "Unknown filter $filter\n";
+				}
+			}
+			$s =~ s/$filter_re/$matches/;
+		}
+		foreach my $f (split /\s+/,$s)
+		{
+			next if $f =~ /^\s*$/;
+			next if $f eq "\\";
+			next if $f =~ /\/SUBSYS.o$/;
+			$f =~ s/,$//; # Remove trailing comma that can show up from filter stuff
+			next unless $f =~ /.*\.o$/;
+			$f =~ s/\.o$/\.c/;
+			if ($f =~ /^\$\(top_builddir\)\/(.*)/)
+			{
+				$f = $1;
+				$f =~ s/\//\\/g;
+				$self->{files}->{$f} = 1;
+			}
+			else
+			{
+				$f =~ s/\//\\/g;
+				$self->{files}->{"$reldir\\$f"} = 1;
+			}
+		}
+		$mf =~ s{OBJS[^=]*=\s*(.*)$}{}m;
+	}
+
+	# Match rules that pull in source files from different directories, eg
+	# pgstrcasecmp.c rint.c snprintf.c: % : $(top_srcdir)/src/port/%
+	my $replace_re = qr{^([^:\n\$]+\.c)\s*:\s*(?:%\s*: )?\$(\([^\)]+\))\/(.*)\/[^\/]+$}m;
+	while ($mf =~ m{$replace_re}m)
+	{
+		my $match = $1;
+		my $top = $2;
+		my $target = $3;
+		$target =~ s{/}{\\}g;
+		my @pieces = split /\s+/,$match;
+		foreach my $fn (@pieces)
+		{
+			if ($top eq "(top_srcdir)")
+			{
+				eval { $self->ReplaceFile($fn, $target) };
+			}
+			elsif ($top eq "(backend_src)")
+			{
+				eval { $self->ReplaceFile($fn, "src\\backend\\$target") };
+			}
+			else
+			{
+				confess "Bad replacement top: $top, on line $_\n";
+			}
+		}
+		$mf =~ s{$replace_re}{}m;
+	}
+
+	# See if this Makefile contains a description, and should have a RC file
+	if ($mf =~ /^PGFILEDESC\s*=\s*\"([^\"]+)\"/m)
+	{
+		my $desc = $1;
+		my $ico;
+		if ($mf =~ /^PGAPPICON\s*=\s*(.*)$/m) { $ico = $1; }
+		$self->AddResourceFile($reldir,$desc,$ico);
+	}
+	$/ = $t;
 }
 
 sub AddResourceFile
 {
-    my ($self, $dir, $desc, $ico) = @_;
-
-    my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
-    my $d = ($year - 100) . "$yday";
-
-    if (Solution::IsNewer("$dir\\win32ver.rc",'src\port\win32ver.rc'))
-    {
-        print "Generating win32ver.rc for $dir\n";
-        open(I,'src\port\win32ver.rc') || confess "Could not open win32ver.rc";
-        open(O,">$dir\\win32ver.rc") || confess "Could not write win32ver.rc";
-        my $icostr = $ico?"IDI_ICON ICON \"src/port/$ico.ico\"":"";
-        while (<I>)
-        {
-            s/FILEDESC/"$desc"/gm;
-            s/_ICO_/$icostr/gm;
-            s/(VERSION.*),0/$1,$d/;
-            if ($self->{type} eq "dll")
-            {
-                s/VFT_APP/VFT_DLL/gm;
-            }
-            print O;
-        }
-    }
-    close(O);
-    close(I);
-    $self->AddFile("$dir\\win32ver.rc");
+	my ($self, $dir, $desc, $ico) = @_;
+
+	my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
+	my $d = ($year - 100) . "$yday";
+
+	if (Solution::IsNewer("$dir\\win32ver.rc",'src\port\win32ver.rc'))
+	{
+		print "Generating win32ver.rc for $dir\n";
+		open(I,'src\port\win32ver.rc') || confess "Could not open win32ver.rc";
+		open(O,">$dir\\win32ver.rc") || confess "Could not write win32ver.rc";
+		my $icostr = $ico?"IDI_ICON ICON \"src/port/$ico.ico\"":"";
+		while (<I>)
+		{
+			s/FILEDESC/"$desc"/gm;
+			s/_ICO_/$icostr/gm;
+			s/(VERSION.*),0/$1,$d/;
+			if ($self->{type} eq "dll")
+			{
+				s/VFT_APP/VFT_DLL/gm;
+			}
+			print O;
+		}
+	}
+	close(O);
+	close(I);
+	$self->AddFile("$dir\\win32ver.rc");
 }
 
 sub DisableLinkerWarnings
 {
-    my ($self, $warnings) = @_;
+	my ($self, $warnings) = @_;
 
-    $self->{disablelinkerwarnings} .= ',' unless ($self->{disablelinkerwarnings} eq '');
-    $self->{disablelinkerwarnings} .= $warnings;
+	$self->{disablelinkerwarnings} .= ',' unless ($self->{disablelinkerwarnings} eq '');
+	$self->{disablelinkerwarnings} .= $warnings;
 }
 
 sub Save
 {
-    my ($self) = @_;
-
-    # If doing DLL and haven't specified a DEF file, do a full export of all symbols
-    # in the project.
-    if ($self->{type} eq "dll" && !$self->{def})
-    {
-        $self->FullExportDLL($self->{name} . ".lib");
-    }
-
-    # Warning 4197 is about double exporting, disable this per
-    # http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=99193
-    $self->DisableLinkerWarnings('4197') if ($self->{platform} eq 'x64');
-
-    # Dump the project
-    open(F, ">$self->{name}$self->{filenameExtension}")
-      || croak("Could not write to $self->{name}$self->{filenameExtension}\n");
-    $self->WriteHeader(*F);
-    $self->WriteFiles(*F);
-    $self->Footer(*F);
-    close(F);
+	my ($self) = @_;
+
+	# If doing DLL and haven't specified a DEF file, do a full export of all symbols
+	# in the project.
+	if ($self->{type} eq "dll" && !$self->{def})
+	{
+		$self->FullExportDLL($self->{name} . ".lib");
+	}
+
+	# Warning 4197 is about double exporting, disable this per
+	# http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=99193
+	$self->DisableLinkerWarnings('4197') if ($self->{platform} eq 'x64');
+
+	# Dump the project
+	open(F, ">$self->{name}$self->{filenameExtension}")
+	  || croak("Could not write to $self->{name}$self->{filenameExtension}\n");
+	$self->WriteHeader(*F);
+	$self->WriteFiles(*F);
+	$self->Footer(*F);
+	close(F);
 }
 
 sub GetAdditionalLinkerDependencies
 {
-    my ($self, $cfgname, $seperator) = @_;
-    my $libcfg = (uc $cfgname eq "RELEASE")?"MD":"MDd";
-    my $libs = '';
-    foreach my $lib (@{$self->{libraries}})
-    {
-        my $xlib = $lib;
-        foreach my $slib (@{$self->{suffixlib}})
-        {
-            if ($slib eq $lib)
-            {
-                $xlib =~ s/\.lib$/$libcfg.lib/;
-                last;
-            }
-        }
-        $libs .= $xlib . $seperator;
-    }
-    $libs =~ s/.$//;
-    $libs =~ s/__CFGNAME__/$cfgname/g;
-    return $libs;
+	my ($self, $cfgname, $seperator) = @_;
+	my $libcfg = (uc $cfgname eq "RELEASE")?"MD":"MDd";
+	my $libs = '';
+	foreach my $lib (@{$self->{libraries}})
+	{
+		my $xlib = $lib;
+		foreach my $slib (@{$self->{suffixlib}})
+		{
+			if ($slib eq $lib)
+			{
+				$xlib =~ s/\.lib$/$libcfg.lib/;
+				last;
+			}
+		}
+		$libs .= $xlib . $seperator;
+	}
+	$libs =~ s/.$//;
+	$libs =~ s/__CFGNAME__/$cfgname/g;
+	return $libs;
 }
 
 # Utility function that loads a complete file
 sub read_file
 {
-    my $filename = shift;
-    my $F;
-    my $t = $/;
+	my $filename = shift;
+	my $F;
+	my $t = $/;
 
-    undef $/;
-    open($F, $filename) || croak "Could not open file $filename\n";
-    my $txt = <$F>;
-    close($F);
-    $/ = $t;
+	undef $/;
+	open($F, $filename) || croak "Could not open file $filename\n";
+	my $txt = <$F>;
+	close($F);
+	$/ = $t;
 
-    return $txt;
+	return $txt;
 }
 
 1;