summaryrefslogtreecommitdiff
path: root/ext/session/mod_files.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/session/mod_files.c')
-rw-r--r--ext/session/mod_files.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c
index ce6365365e..96f0c3a93e 100644
--- a/ext/session/mod_files.c
+++ b/ext/session/mod_files.c
@@ -123,7 +123,7 @@ static void ps_files_close(ps_files *data)
}
}
-static int ps_files_open(ps_files *data, const char *key)
+static void ps_files_open(ps_files *data, const char *key)
{
char buf[MAXPATHLEN];
TSRMLS_FETCH();
@@ -138,7 +138,7 @@ static int ps_files_open(ps_files *data, const char *key)
if (!ps_files_valid_key(key) ||
!ps_files_path_create(buf, sizeof(buf), data, key))
- return FAILURE;
+ return;
data->lastkey = estrdup(key);
@@ -153,13 +153,10 @@ static int ps_files_open(ps_files *data, const char *key)
if (data->fd != -1)
flock(data->fd, LOCK_EX);
- if (data->fd == -1) {
+ if (data->fd == -1)
php_error(E_WARNING, "open(%s, O_RDWR) failed: %s (%d)", buf,
strerror(errno), errno);
- return FAILURE;
- }
}
- return SUCCESS;
}
static int ps_files_cleanup_dir(const char *dirname, int maxlifetime)
@@ -257,9 +254,7 @@ PS_READ_FUNC(files)
struct stat sbuf;
PS_FILES_DATA;
- if (ps_files_open(data, key) == FAILURE)
- return FAILURE;
-
+ ps_files_open(data, key);
if (data->fd < 0)
return FAILURE;
@@ -288,9 +283,7 @@ PS_WRITE_FUNC(files)
long n;
PS_FILES_DATA;
- if (ps_files_open(data, key) == FAILURE)
- return FAILURE;
-
+ ps_files_open(data, key);
if (data->fd < 0)
return FAILURE;