|
 |
dc8c34 |
From 179b741ca8c2936504f653c1b81c8f8f38adc341 Mon Sep 17 00:00:00 2001
|
|
|
dc8c34 |
From: Rich Megginson <rmeggins@redhat.com>
|
|
|
dc8c34 |
Date: Tue, 2 Jul 2013 14:38:49 -0600
|
|
|
dc8c34 |
Subject: [PATCH 134/225] Ticket #47387 - improve logconv.pl performance with
|
|
|
dc8c34 |
large access logs
|
|
|
dc8c34 |
|
|
|
dc8c34 |
https://fedorahosted.org/389/ticket/47387
|
|
|
dc8c34 |
Reviewed by: mreynolds (Thanks!)
|
|
|
dc8c34 |
Branch: master
|
|
|
dc8c34 |
Fix Description: Fix some additional uninitialized variable warnings
|
|
|
dc8c34 |
Platforms tested: RHEL6 x86_64
|
|
|
dc8c34 |
Flag Day: no
|
|
|
dc8c34 |
Doc impact: no
|
|
|
dc8c34 |
(cherry picked from commit 8a23f5e0af41291d28c4ce7251d9bb2e94a5994c)
|
|
|
dc8c34 |
(cherry picked from commit 7a107bdb67dad58728977b3f410df1d94c6cdb91)
|
|
|
dc8c34 |
(cherry picked from commit 34468104d63f6d439ff2ed8bc0b9afa2751b5b0a)
|
|
|
dc8c34 |
(cherry picked from commit 0163575f154d14c0abd87da7bd7e5f736b2e9e8b)
|
|
|
dc8c34 |
---
|
|
|
dc8c34 |
ldap/admin/src/logconv.pl | 8 ++++----
|
|
|
dc8c34 |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
dc8c34 |
|
|
|
dc8c34 |
diff --git a/ldap/admin/src/logconv.pl b/ldap/admin/src/logconv.pl
|
|
|
dc8c34 |
index b628d03..ec0fdf5 100755
|
|
|
dc8c34 |
--- a/ldap/admin/src/logconv.pl
|
|
|
dc8c34 |
+++ b/ldap/admin/src/logconv.pl
|
|
|
dc8c34 |
@@ -673,7 +673,7 @@ if ($verb eq "yes" || $usage =~ /u/){
|
|
|
dc8c34 |
|
|
|
dc8c34 |
my $notesCount = "1";
|
|
|
dc8c34 |
my $unindexedIp;
|
|
|
dc8c34 |
- for (my $n = 0; $n <= scalar(@{$notesEtime}); $n++){
|
|
|
dc8c34 |
+ for (my $n = 0; $n < scalar(@{$notesEtime}); $n++){
|
|
|
dc8c34 |
if($conn_hash->{$notesConn->[$n]} eq ""){
|
|
|
dc8c34 |
$unindexedIp = "?";
|
|
|
dc8c34 |
} else {
|
|
|
dc8c34 |
@@ -726,7 +726,7 @@ if ($verb eq "yes" || $usage =~ /u/){
|
|
|
dc8c34 |
|
|
|
dc8c34 |
my $notesCount = "1";
|
|
|
dc8c34 |
my $unindexedIp;
|
|
|
dc8c34 |
- for (my $n = 0; $n <= scalar(@{$notesEtime}); $n++){
|
|
|
dc8c34 |
+ for (my $n = 0; $n < scalar(@{$notesEtime}); $n++){
|
|
|
dc8c34 |
if($conn_hash->{$notesConn->[$n]} eq ""){
|
|
|
dc8c34 |
$unindexedIp = "?";
|
|
|
dc8c34 |
} else {
|
|
|
dc8c34 |
@@ -1821,7 +1821,7 @@ sub parseLineNormal
|
|
|
dc8c34 |
$con = $1;
|
|
|
dc8c34 |
if ($_ =~ /op= *([0-9]+)/i){ $op = $1;}
|
|
|
dc8c34 |
}
|
|
|
dc8c34 |
- for (my $i=0; $i <= $vlvCount;$i++){
|
|
|
dc8c34 |
+ for (my $i=0; $i < $vlvCount;$i++){
|
|
|
dc8c34 |
if ($vlvconn[$i] eq $con && $vlvop[$i] eq $op){ $vlvNotesACount++; $isVlvNotes="1";}
|
|
|
dc8c34 |
}
|
|
|
dc8c34 |
if($isVlvNotes == 0){
|
|
|
dc8c34 |
@@ -1846,7 +1846,7 @@ sub parseLineNormal
|
|
|
dc8c34 |
$con = $1;
|
|
|
dc8c34 |
if ($_ =~ /op= *([0-9]+)/i){ $op = $1;}
|
|
|
dc8c34 |
}
|
|
|
dc8c34 |
- for (my $i=0; $i <= $vlvCount;$i++){
|
|
|
dc8c34 |
+ for (my $i=0; $i < $vlvCount;$i++){
|
|
|
dc8c34 |
if ($vlvconn[$i] eq $con && $vlvop[$i] eq $op){ $vlvNotesUCount++; $isVlvNotes="1";}
|
|
|
dc8c34 |
}
|
|
|
dc8c34 |
if($isVlvNotes == 0){
|
|
|
dc8c34 |
--
|
|
|
dc8c34 |
1.8.1.4
|
|
|
dc8c34 |
|