pf-tools commit: r448 [ccaillet-guest] - in /trunk/filters:
filter_filename filter_privateresolve filter_vlan2if
parmelan-guest at users.alioth.debian.org
parmelan-guest at users.alioth.debian.org
Mon Mar 5 16:01:21 CET 2007
Author: ccaillet-guest
Date: Mon Mar 5 15:01:21 2007
New Revision: 448
URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=448
Log:
CLEAN:
* adding use strict on filters
* using PFTools modules
Modified:
trunk/filters/filter_filename
trunk/filters/filter_privateresolve
trunk/filters/filter_vlan2if
Modified: trunk/filters/filter_filename
URL: http://svn.debian.org/wsvn/pf-tools/trunk/filters/filter_filename?rev=448&op=diff
==============================================================================
--- trunk/filters/filter_filename (original)
+++ trunk/filters/filter_filename Mon Mar 5 15:01:21 2007
@@ -1,5 +1,7 @@
#!/usr/bin/perl -w
-
+##
+## $Id$
+##
## Copyright (C) 2005 Olivier MOLTENI <olivier at molteni.net>
##
## This program is free software; you can redistribute it and/or
@@ -17,12 +19,11 @@
## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
##
-#use strict;
+use strict;
use warnings;
-require("lib-conf");
-require("lib-net");
-require("lib-update");
+use PFTools::Net ;
+use PFTools::Update ;
my ( $src, $host, $dst ) = @ARGV;
@@ -31,11 +32,11 @@
exit 1;
}
-$Z = Init_lib_net( Get_source($src) );
+my $Z = Init_lib_net( Get_source($src) );
open( DEST, ">$dst" ) || die "write open failed on $dst";
-$filename = Get_Active_Filename( $Z, $host );
+my $filename = Get_Active_Filename( $Z, $host );
if ( defined $filename ) {
print DEST $filename;
Modified: trunk/filters/filter_privateresolve
URL: http://svn.debian.org/wsvn/pf-tools/trunk/filters/filter_privateresolve?rev=448&op=diff
==============================================================================
--- trunk/filters/filter_privateresolve (original)
+++ trunk/filters/filter_privateresolve Mon Mar 5 15:01:21 2007
@@ -1,5 +1,7 @@
#!/usr/bin/perl -w
-
+##
+## $Id$
+##
## Copyright (C) 2005 Olivier MOLTENI <olivier at molteni.net>
##
## This program is free software; you can redistribute it and/or
@@ -17,12 +19,11 @@
## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
##
-#use strict;
+use strict;
use warnings;
-require("lib-conf");
-require("lib-net");
-require("lib-update");
+use PFTools::Net ;
+use PFTools::Update ;
my ( $src, $host, $dst, $sep ) = @ARGV;
@@ -35,14 +36,14 @@
exit 1;
}
-$Z = Init_lib_net( Get_source("GLOBAL:private-network") );
+my $Z = Init_lib_net( Get_source("GLOBAL:private-network") );
open( SRC, "<$src" ) || die "read open failed on $src";
open( DEST, ">$dst" ) || die "write open failed on $dst";
while (<SRC>) {
- $line = $_;
- $pos = length($line);
+ my $line = $_;
+ my $pos = length($line);
while (
substr( $line, 0, $pos ) =~
m/^(.*[^A-Za-z0-9.-])?([A-Za-z0-9.-]+)(\\?)(\.$Z->{SOA}->{name})([^A-Za-z0-9.-].*)?$/
@@ -67,7 +68,7 @@
if ( $sep eq "DUPLICATE" ) {
my $templine = "";
my $templine2;
- foreach $res (@resolved) {
+ foreach my $res (@resolved) {
$templine2 = $line;
substr( $templine2, $lengthbefore, length($match) ) =
$res;
Modified: trunk/filters/filter_vlan2if
URL: http://svn.debian.org/wsvn/pf-tools/trunk/filters/filter_vlan2if?rev=448&op=diff
==============================================================================
--- trunk/filters/filter_vlan2if (original)
+++ trunk/filters/filter_vlan2if Mon Mar 5 15:01:21 2007
@@ -4,6 +4,9 @@
# eth.vlan -> ethx.y
# eth-vlan -> ethx
+##
+## $Id$
+##
## Copyright (C) 2005 Olivier MOLTENI <olivier at molteni.net>
##
## This program is free software; you can redistribute it and/or
@@ -21,12 +24,11 @@
## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
##
-#use strict;
+use strict;
use warnings;
-require("lib-conf");
-require("lib-net");
-require("lib-update");
+use PFTools::Net ;
+use PFTools::Update ;
my ( $src, $host, $dst ) = @ARGV;
@@ -35,14 +37,14 @@
exit 1;
}
-$Z = Init_lib_net( Get_source("GLOBAL:private-network") );
+my $Z = Init_lib_net( Get_source("GLOBAL:private-network") );
open( SRC, "<$src" ) || die "read open failed on $src";
open( DEST, ">$dst" ) || die "write open failed on $dst";
while (<SRC>) {
- $line = $_;
- $pos = length($line);
+ my $line = $_;
+ my $pos = length($line);
while (
substr( $line, 0, $pos ) =~
m/^(.*[^A-Za-z0-9.-])?(eth([-.:])([a-z0-9-]+))([^A-Za-z0-9.-].*)?$/ )
More information about the Pf-tools-commits
mailing list