diff --git a/src/backend/catalog/Catalog.pm b/src/backend/catalog/Catalog.pm index 2889cb9..07bd5f3 100644 --- a/src/backend/catalog/Catalog.pm +++ b/src/backend/catalog/Catalog.pm @@ -196,7 +196,7 @@ sub ParseHeader else { die - "unknown column option $attopt on column $attname"; + "unknown or misformatted column option $attopt on column $attname"; } if ($column{forcenull} and $column{forcenotnull}) diff --git a/src/backend/catalog/genbki.pl b/src/backend/catalog/genbki.pl index fb61db0..ebdc919 100644 --- a/src/backend/catalog/genbki.pl +++ b/src/backend/catalog/genbki.pl @@ -357,8 +357,7 @@ EOM } # Emit Anum_* constants - print $def - sprintf("#define Anum_%s_%s %s\n", $catname, $attname, $attnum); + printf $def "#define Anum_%s_%s %s\n", $catname, $attname, $attnum; } print $bki "\n )\n"; @@ -493,7 +492,7 @@ EOM } print $bki "close $catname\n"; - print $def sprintf("\n#endif\t\t\t\t\t\t\t/* %s_D_H */\n", uc $catname); + printf $def "\n#endif\t\t\t\t\t\t\t/* %s_D_H */\n", uc $catname; # Close and rename definition header close $def; diff --git a/src/backend/utils/Gen_fmgrtab.pl b/src/backend/utils/Gen_fmgrtab.pl index 5fd5313..6c9f1a7 100644 --- a/src/backend/utils/Gen_fmgrtab.pl +++ b/src/backend/utils/Gen_fmgrtab.pl @@ -117,8 +117,8 @@ open my $pfh, '>', $protosfile . $tmpext open my $tfh, '>', $tabfile . $tmpext or die "Could not open $tabfile$tmpext: $!"; -print $ofh - qq|/*------------------------------------------------------------------------- +print $ofh <', $datfile or die "can't open $datfile: $!"; - # Write the data. foreach my $data (@{ $catalog_data{$catname} }) {