CDB support: never refer to it as just "DB" in messages, it confuses people

diff --git a/includes/Cdb.php b/includes/Cdb.php
index a65462f..6047748 100644 (file)
--- a/includes/Cdb.php
+++ b/includes/Cdb.php
@@ -98,7 +98,7 @@ class CdbReader_DBA {
        function __construct( $fileName ) {
                $this->handle = dba_open( $fileName, 'r-', 'cdb' );
                if ( !$this->handle ) {
-                       throw new MWException( 'Unable to open DB file "' . $fileName . '"' );
+                       throw new MWException( 'Unable to open CDB file "' . $fileName . '"' );
                }
        }
 
@@ -125,7 +125,7 @@ class CdbWriter_DBA {
                $this->tmpFileName = $fileName . '.tmp.' . mt_rand( 0, 0x7fffffff );
                $this->handle = dba_open( $this->tmpFileName, 'n', 'cdb_make' );
                if ( !$this->handle ) {
-                       throw new MWException( 'Unable to open DB file for write "' . $fileName . '"' );
+                       throw new MWException( 'Unable to open CDB file for write "' . $fileName . '"' );
                }
        }
 

diff --git a/includes/Cdb_PHP.php b/includes/Cdb_PHP.php
index 20a758b..1485cc6 100644 (file)
--- a/includes/Cdb_PHP.php
+++ b/includes/Cdb_PHP.php
@@ -97,7 +97,7 @@ class CdbReader_PHP extends CdbReader {
        function __construct( $fileName ) {
                $this->handle = fopen( $fileName, 'rb' );
                if ( !$this->handle ) {
-                       throw new MWException( 'Unable to open DB file "' . $fileName . '"' );
+                       throw new MWException( 'Unable to open CDB file "' . $fileName . '"' );
                }
                $this->findStart();
        }
@@ -138,7 +138,7 @@ class CdbReader_PHP extends CdbReader {
 
                $buf = fread( $this->handle, $length );
                if ( $buf === false || strlen( $buf ) !== $length ) {
-                       throw new MWException( __METHOD__.': read from cdb file failed, file may be corrupted' );
+                       throw new MWException( __METHOD__.': read from CDB file failed, file may be corrupted' );
                }
                return $buf;
        }
@@ -224,7 +224,7 @@ class CdbWriter_PHP extends CdbWriter {
                $this->tmpFileName = $fileName . '.tmp.' . mt_rand( 0, 0x7fffffff );
                $this->handle = fopen( $this->tmpFileName, 'wb' );
                if ( !$this->handle ) {
-                       throw new MWException( 'Unable to open DB file for write "' . $fileName . '"' );
+                       throw new MWException( 'Unable to open CDB file for write "' . $fileName . '"' );
                }
                $this->hplist = array();
                $this->numentries = 0;