[PATCH] DB/DB/mysql4.php: ws fixes
| From: | Roman Neuhauser | Date: | Fri, 06 Jun 2003 11:20:06 +0000 |
| Subject: | [PATCH] DB/DB/mysql4.php: ws fixes | ||
| Groups: | php.pear.dev | ||
| Request: | Send a blank email to pear-dev+get-17115@lists.php.net to get a copy of this message | ||
coding standards compliance:
* tabs -> spaces
* s/^\s+$//
--
If you cc me or remove the list(s) completely I'll most likely ignore
your message. see http://www.eyrie.org./~eagle/faqs/questions.html
Index: DB/DB/mysql4.php =================================================================== RCS file: /repository/pear/DB/DB/mysql4.php,v retrieving revision 1.5 diff -u -u -r1.5 mysql4.php --- DB/DB/mysql4.php 7 May 2003 16:58:28 -0000 1.5 +++ DB/DB/mysql4.php 6 Jun 2003 11:12:26 -0000 @@ -13,8 +13,8 @@ // | obtain it through the world-wide-web, please send a note to | // | license@php.net so we can mail you a copy immediately. | // +----------------------------------------------------------------------+ -// | Author: Chaillan Nicolas <nicos@php.net> | -// | Based on mysql.php by Stig Bakken <ssb@php.net> | +// | Author: Chaillan Nicolas <nicos@php.net> | +// | Based on mysql.php by Stig Bakken <ssb@php.net> | // +----------------------------------------------------------------------+ // @@ -95,7 +95,7 @@ { if (!DB::assertExtension('mysql')) { return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND); - } + } $this->dsn = $dsninfo; if (isset($dsninfo['protocol']) && $dsninfo['protocol'] == 'unix') { @@ -109,12 +109,12 @@ $user = $dsninfo['username']; $pw = $dsninfo['password']; - $ssl_mode = $ssl ? 'CLIENT_SSL' : NULL; + $ssl_mode = $ssl ? 'CLIENT_SSL' : NULL; @ini_set('track_errors', true); - - if ($dbhost && $user && $pw) { - // Need to verify if arguments are okay + + if ($dbhost && $user && $pw) { + // Need to verify if arguments are okay $conn = @mysql_connect($dbhost, $user, $pw, $ssl_mode); } elseif ($dbhost && $user) { $conn = @mysql_connect($dbhost, $user, NULL, $ssl_mode); @@ -123,8 +123,8 @@ } else { $conn = false; } - - @ini_restore('track_errors'); + + @ini_restore('track_errors'); if (empty($conn)) { if (($err = @mysql_error()) != '') {
Index: DB/DB/mysql4.php =================================================================== RCS file: /repository/pear/DB/DB/mysql4.php,v retrieving revision 1.5 diff -u -u -r1.5 mysql4.php --- DB/DB/mysql4.php 7 May 2003 16:58:28 -0000 1.5 +++ DB/DB/mysql4.php 6 Jun 2003 11:12:26 -0000 @@ -13,8 +13,8 @@ // | obtain it through the world-wide-web, please send a note to | // | license@php.net so we can mail you a copy immediately. | // +----------------------------------------------------------------------+ -// | Author: Chaillan Nicolas <nicos@php.net> | -// | Based on mysql.php by Stig Bakken <ssb@php.net> | +// | Author: Chaillan Nicolas <nicos@php.net> | +// | Based on mysql.php by Stig Bakken <ssb@php.net> | // +----------------------------------------------------------------------+ // @@ -95,7 +95,7 @@ { if (!DB::assertExtension('mysql')) { return $this->raiseError(DB_ERROR_EXTENSION_NOT_FOUND); - } + } $this->dsn = $dsninfo; if (isset($dsninfo['protocol']) && $dsninfo['protocol'] == 'unix') { @@ -109,12 +109,12 @@ $user = $dsninfo['username']; $pw = $dsninfo['password']; - $ssl_mode = $ssl ? 'CLIENT_SSL' : NULL; + $ssl_mode = $ssl ? 'CLIENT_SSL' : NULL; @ini_set('track_errors', true); - - if ($dbhost && $user && $pw) { - // Need to verify if arguments are okay + + if ($dbhost && $user && $pw) { + // Need to verify if arguments are okay $conn = @mysql_connect($dbhost, $user, $pw, $ssl_mode); } elseif ($dbhost && $user) { $conn = @mysql_connect($dbhost, $user, NULL, $ssl_mode); @@ -123,8 +123,8 @@ } else { $conn = false; } - - @ini_restore('track_errors'); + + @ini_restore('track_errors'); if (empty($conn)) { if (($err = @mysql_error()) != '') {