robin/smb
1
0
Fork 0
mirror of https://codeberg.org/icewind/SMB.git synced 2026-06-03 17:24:07 +02:00
Code Issues Projects Releases Packages Wiki Activity

Some cleanup

Browse source
This commit is contained in:
Robin Appelman 2014-08-03 16:00:24 +02:00
commit 40b6fb8d12
1 changed files with 28 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

86
src/NativeState.php
View file

@ -7,6 +7,8 @@
namespace Icewind\SMB; namespace Icewind\SMB;
require_once 'ErrorCodes.php';
/** /**
* Low level wrapper for libsmbclient-php for error handling * Low level wrapper for libsmbclient-php for error handling
*/ */
@ -48,6 +50,12 @@ class NativeState {
} }
} }
protected function testResult($result) {
if ($result === false or $result === null) {
$this->handleError();
}
}
/** /**
* @param string $workGroup * @param string $workGroup
* @param string $user * @param string $user
@ -61,9 +69,7 @@ class NativeState {
$this->state = smbclient_state_new(); $this->state = smbclient_state_new();
$result = @smbclient_state_init($this->state, $workGroup, $user, $password); $result = @smbclient_state_init($this->state, $workGroup, $user, $password);
if ($result === false) { $this->testResult($result);
$this->handleError();
}
$this->connected = true; $this->connected = true;
return $result; return $result;
} }
@ -75,9 +81,7 @@ class NativeState {
public function opendir($uri) { public function opendir($uri) {
$result = @smbclient_opendir($this->state, $uri); $result = @smbclient_opendir($this->state, $uri);
if ($result === false) { $this->testResult($result);
$this->handleError();
}
return $result; return $result;
} }
@ -88,9 +92,7 @@ class NativeState {
public function readdir($dir) { public function readdir($dir) {
$result = @smbclient_readdir($this->state, $dir); $result = @smbclient_readdir($this->state, $dir);
if ($result === false) { $this->testResult($result);
$this->handleError();
}
return $result; return $result;
} }
@ -99,11 +101,9 @@ class NativeState {
* @return bool * @return bool
*/ */
public function closedir($dir) { public function closedir($dir) {
$result = @smbclient_closedir($this->state, $dir); $result = smbclient_closedir($this->state, $dir);
if ($result === false) { $this->testResult($result);
$this->handleError();
}
return $result; return $result;
} }
@ -115,9 +115,7 @@ class NativeState {
public function rename($old, $new) { public function rename($old, $new) {
$result = @smbclient_rename($this->state, $old, $this->state, $new); $result = @smbclient_rename($this->state, $old, $this->state, $new);
if ($result === false) { $this->testResult($result);
$this->handleError();
}
return $result; return $result;
} }
@ -128,9 +126,7 @@ class NativeState {
public function unlink($uri) { public function unlink($uri) {
$result = @smbclient_unlink($this->state, $uri); $result = @smbclient_unlink($this->state, $uri);
if ($result === false) { $this->testResult($result);
$this->handleError();
}
return $result; return $result;
} }
@ -142,9 +138,7 @@ class NativeState {
public function mkdir($uri, $mask = 0777) { public function mkdir($uri, $mask = 0777) {
$result = @smbclient_mkdir($this->state, $uri, $mask); $result = @smbclient_mkdir($this->state, $uri, $mask);
if ($result === false) { $this->testResult($result);
$this->handleError();
}
return $result; return $result;
} }
@ -155,9 +149,7 @@ class NativeState {
public function rmdir($uri) { public function rmdir($uri) {
$result = @smbclient_rmdir($this->state, $uri); $result = @smbclient_rmdir($this->state, $uri);
if ($result === false) { $this->testResult($result);
$this->handleError();
}
return $result; return $result;
} }
@ -168,9 +160,7 @@ class NativeState {
public function stat($uri) { public function stat($uri) {
$result = @smbclient_stat($this->state, $uri); $result = @smbclient_stat($this->state, $uri);
if ($result === false) { $this->testResult($result);
$this->handleError();
}
return $result; return $result;
} }
@ -181,9 +171,7 @@ class NativeState {
public function fstat($file) { public function fstat($file) {
$result = @smbclient_fstat($this->state, $file); $result = @smbclient_fstat($this->state, $file);
if ($result === false) { $this->testResult($result);
$this->handleError();
}
return $result; return $result;
} }
@ -196,9 +184,7 @@ class NativeState {
public function open($uri, $mode, $mask = 0666) { public function open($uri, $mode, $mask = 0666) {
$result = @smbclient_open($this->state, $uri, $mode, $mask); $result = @smbclient_open($this->state, $uri, $mode, $mask);
if ($result === false) { $this->testResult($result);
$this->handleError();
}
return $result; return $result;
} }
@ -210,9 +196,7 @@ class NativeState {
public function create($uri, $mask = 0666) { public function create($uri, $mask = 0666) {
$result = @smbclient_creat($this->state, $uri, $mask); $result = @smbclient_creat($this->state, $uri, $mask);
if ($result === false) { $this->testResult($result);
$this->handleError();
}
return $result; return $result;
} }
@ -224,9 +208,7 @@ class NativeState {
public function read($file, $bytes) { public function read($file, $bytes) {
$result = @smbclient_read($this->state, $file, $bytes); $result = @smbclient_read($this->state, $file, $bytes);
if ($result === false) { $this->testResult($result);
$this->handleError();
}
return $result; return $result;
} }
@ -239,9 +221,7 @@ class NativeState {
public function write($file, $data, $length = null) { public function write($file, $data, $length = null) {
$result = @smbclient_write($this->state, $file, $data, $length); $result = @smbclient_write($this->state, $file, $data, $length);
if ($result === false) { $this->testResult($result);
$this->handleError();
}
return $result; return $result;
} }
@ -254,9 +234,7 @@ class NativeState {
public function lseek($file, $offset, $whence = SEEK_SET) { public function lseek($file, $offset, $whence = SEEK_SET) {
$result = @smbclient_lseek($this->state, $file, $offset, $whence); $result = @smbclient_lseek($this->state, $file, $offset, $whence);
if ($result === false) { $this->testResult($result);
$this->handleError();
}
return $result; return $result;
} }
@ -268,18 +246,14 @@ class NativeState {
public function ftruncate($file, $size) { public function ftruncate($file, $size) {
$result = @smbclient_ftruncate($this->state, $file, $size); $result = @smbclient_ftruncate($this->state, $file, $size);
if ($result === false) { $this->testResult($result);
$this->handleError();
}
return $result; return $result;
} }
public function close($file) { public function close($file) {
$result = @smbclient_close($this->state, $file); $result = @smbclient_close($this->state, $file);
if ($result === false) { $this->testResult($result);
$this->handleError();
}
return $result; return $result;
} }
@ -291,9 +265,7 @@ class NativeState {
public function getxattr($uri, $key) { public function getxattr($uri, $key) {
$result = @smbclient_getxattr($this->state, $uri, $key); $result = @smbclient_getxattr($this->state, $uri, $key);
if ($result === false) { $this->testResult($result);
$this->handleError();
}
return $result; return $result;
} }
@ -307,9 +279,7 @@ class NativeState {
public function setxattr($uri, $key, $value, $flags = 0) { public function setxattr($uri, $key, $value, $flags = 0) {
$result = @smbclient_setxattr($this->state, $uri, $key, $value, $flags); $result = @smbclient_setxattr($this->state, $uri, $key, $value, $flags);
if ($result === false) { $this->testResult($result);
$this->handleError();
}
return $result; return $result;
} }