projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
load_data return allways, all exit() calls removed, all load_data calls are protected
[brisk.git]
/
web
/
briskin5
/
Obj
/
briskin5.phh
diff --git
a/web/briskin5/Obj/briskin5.phh
b/web/briskin5/Obj/briskin5.phh
index
78d5766
..
3da1545
100644
(file)
--- a/
web/briskin5/Obj/briskin5.phh
+++ b/
web/briskin5/Obj/briskin5.phh
@@
-575,11
+575,9
@@
class Bin5_user extends User {
{
log_main("Bin5_user::load_data: tab_id [".$tab_id."] id [".$id."] sess [".($sess == FALSE ? "FALSE" : $sess)."] ");
{
log_main("Bin5_user::load_data: tab_id [".$tab_id."] id [".$id."] sess [".($sess == FALSE ? "FALSE" : $sess)."] ");
- $doexit = FALSE;
do {
if (($tok = @ftok(FTOK_PATH."/bin5/table".$tab_id."/user".$id, "B")) == -1) {
log_main("ftok failed");
do {
if (($tok = @ftok(FTOK_PATH."/bin5/table".$tab_id."/user".$id, "B")) == -1) {
log_main("ftok failed");
- $doexit = TRUE;
break;
}
break;
}
@@
-594,7
+592,6
@@
class Bin5_user extends User {
$user = @shm_get_var($shm, $tok);
if ($sess != FALSE && $user->sess != $sess) {
$user = @shm_get_var($shm, $tok);
if ($sess != FALSE && $user->sess != $sess) {
- $doexit = TRUE;
break;
}
log_only("user == ".($user == FALSE ? "FALSE" : "TRUE")." user === ".($user === FALSE ? "FALSE" : "TRUE")." user isset ".(isset($user) ? "TRUE" : "FALSE"));
break;
}
log_only("user == ".($user == FALSE ? "FALSE" : "TRUE")." user === ".($user === FALSE ? "FALSE" : "TRUE")." user isset ".(isset($user) ? "TRUE" : "FALSE"));
@@
-634,8
+631,7
@@
class Bin5_user extends User {
return ($user);
} while (0);
return ($user);
} while (0);
- if ($doexit)
- exit();
+ log_crit("Bin5_user::load_data:ret FALSE");
return (FALSE);
}
return (FALSE);
}
@@
-809,7
+805,6
@@
class Bin5 {
// Bin5::load_data
static function load_data($table_idx, $table_token = "")
{
// Bin5::load_data
static function load_data($table_idx, $table_token = "")
{
- $doexit = FALSE;
$shm = FALSE;
log_wr("TABLE_FTOK ".FTOK_PATH."/bin5/table".$table_idx."/table");
$shm = FALSE;
log_wr("TABLE_FTOK ".FTOK_PATH."/bin5/table".$table_idx."/table");
@@
-817,7
+812,6
@@
class Bin5 {
do {
if (($tok = @ftok(FTOK_PATH."/bin5/table".$table_idx."/table", "B")) == -1) {
log_main("ftok failed");
do {
if (($tok = @ftok(FTOK_PATH."/bin5/table".$table_idx."/table", "B")) == -1) {
log_main("ftok failed");
- $doexit = TRUE;
break;
}
break;
}
@@
-841,7
+835,13
@@
class Bin5 {
shm_detach($shm);
for ($i = 0 ; $i < BIN5_MAX_PLAYERS ; $i++) {
shm_detach($shm);
for ($i = 0 ; $i < BIN5_MAX_PLAYERS ; $i++) {
- $bri->user[$i] = Bin5_user::load_data($table_idx, $i, FALSE);
+ if (($bri->user[$i] = Bin5_user::load_data($table_idx, $i, FALSE)) == FALSE) {
+ log_crit("Bin5_user::load_data failed");
+ break;
+ }
+ }
+ if ($i < BIN5_MAX_PLAYERS) {
+ break;
}
return ($bri);
}
return ($bri);
@@
-851,8
+851,6
@@
class Bin5 {
shm_detach($shm);
log_wr("briskin5 load_data failed");
shm_detach($shm);
log_wr("briskin5 load_data failed");
- if ($doexit)
- exit();
return (FALSE);
}
return (FALSE);
}