From 9d717c126201690d65853c7874709423e617b05c Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 28 Oct 2012 20:43:28 +0000
Subject: [PATCH] rename some members of $r, $s

---
 cgi-auth-hybrid.pm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/cgi-auth-hybrid.pm b/cgi-auth-hybrid.pm
index 76342e4..820c738 100644
--- a/cgi-auth-hybrid.pm
+++ b/cgi-auth-hybrid.pm
@@ -54,7 +54,7 @@ sub new_verifier {
 				: '' },
 	    get_method => sub { $_[0]->request_method() },
 	},
-	D => undef,
+	Dbh => undef,
     };
     my ($k,$v);
     while (($k,$v,@_) = @_) {
@@ -68,7 +68,7 @@ sub new_verifier {
 
 sub _dbopen ($) {
     my ($s) = @_;
-    my $dbh = $s->{D};
+    my $dbh = $s->{Dbh};
     return $dbh if $dbh; 
 
     $s->{S}{assocdb_dsn} ||= "dbi:SQLite:dbname=$s->{S}{assocdb_path}";
@@ -79,7 +79,7 @@ sub _dbopen ($) {
 			 AutoCommit => 0, RaiseError => 1,
 		     });
     die "${assocdb_dsn} $! ?" unless $dbh;
-    $s->{D} = $dbh;
+    $s->{Dbh} = $dbh;
 
     $dbh->do("BEGIN");
 
@@ -104,8 +104,8 @@ sub new_request {
     }
     my $r = {
 	S => $classbase->{S},
-	D => $classbase->{D},
-	C => $cgi,
+	Dbh => $classbase->{Dbh},
+	Cgi => $cgi,
     };
     bless $r, ref $classbase;
 }
@@ -113,7 +113,7 @@ sub new_request {
 sub _cm ($$@) {
     my ($r,$methname, @args) = @_;
     my $methfunc = $r->{S}{$methname};
-    return $methfunc->($r->{C}, $r, @args);
+    return $methfunc->($r->{Cgi}, $r, @args);
 }
 
 sub record_login ($$) {
@@ -126,7 +126,7 @@ sub record_login ($$) {
     read($rsf,$nassocbin,$bytes) == $bytes or die "$rsp $!";
     close $rsf;
     my $nassoc = unpack "H*", $nassocbin;
-    my $dbh = $r->{D};
+    my $dbh = $r->{Dbh};
     $dbh->do("INSERT INTO $r->{S}{assocdb_table}".
 	     " (associd, username, last) VALUES (?,?,?)", {},
 	     $nassoc, $nusername, time);
-- 
2.30.2