Weep out all recent commits of Yasuo.

I don't have time right now to leave in the good ones and remove
only the bad ones.

There are some semantical changes which I reject, because
they aim at fixing a bug which is at a completely other location.

Then SID does not gefined anymore properly. (This broken patch
has not been sent to me at all.)

Also, there were *so* many whitespace changes which already
make these commits bogus.

Author: Sascha Schumann

ext/session/mod_files.c

@@ -123,9 +123,10 @@ static void ps_files_close(ps_files *data)
 	}
 }
 
-static void ps_files_open(ps_files *data, const char *key TSRMLS_DC)
+static void ps_files_open(ps_files *data, const char *key)
 {
 	char buf[MAXPATHLEN];
+	TSRMLS_FETCH();
 
 	if (data->fd < 0 || !data->lastkey || strcmp(key, data->lastkey)) {
 		if (data->lastkey) {
@@ -136,10 +137,8 @@ static void ps_files_open(ps_files *data, const char *key TSRMLS_DC)
 		ps_files_close(data);
 
 		if (!ps_files_valid_key(key) || 
-			!ps_files_path_create(buf, sizeof(buf), data, key)) {
-			data->fd = -1;
+				!ps_files_path_create(buf, sizeof(buf), data, key))
 			return;
-		}
 
 		data->lastkey = estrdup(key);
 
@@ -160,7 +159,7 @@ static void ps_files_open(ps_files *data, const char *key TSRMLS_DC)
 	}
 }
 
-static int ps_files_cleanup_dir(const char *dirname, int maxlifetime TSRMLS_DC)
+static int ps_files_cleanup_dir(const char *dirname, int maxlifetime)
 {
 	DIR *dir;
 	char dentry[sizeof(struct dirent) + MAXPATHLEN];
@@ -170,6 +169,7 @@ static int ps_files_cleanup_dir(const char *dirname, int maxlifetime TSRMLS_DC)
 	time_t now;
 	int nrdels = 0;
 	size_t dirname_len;
+	TSRMLS_FETCH();
 
 	dir = opendir(dirname);
 	if (!dir) {
@@ -254,7 +254,7 @@ PS_READ_FUNC(files)
 	struct stat sbuf;
 	PS_FILES_DATA;
 
-	ps_files_open(data, key TSRMLS_CC);
+	ps_files_open(data, key);
 	if (data->fd < 0)
 		return FAILURE;
 
@@ -283,7 +283,7 @@ PS_WRITE_FUNC(files)
 	long n;
 	PS_FILES_DATA;
 
-	ps_files_open(data, key TSRMLS_CC);
+	ps_files_open(data, key);
 	if (data->fd < 0)
 		return FAILURE;
 
@@ -314,6 +314,7 @@ PS_DESTROY_FUNC(files)
 {
 	char buf[MAXPATHLEN];
 	PS_FILES_DATA;
+	TSRMLS_FETCH();
 
 	if (!ps_files_path_create(buf, sizeof(buf), data, key))
 		return FAILURE;
@@ -336,7 +337,7 @@ PS_GC_FUNC(files)
 	   an external entity (i.e. find -ctime x | xargs rm) */
 
 	if (data->dirdepth == 0)
-		*nrdels = ps_files_cleanup_dir(data->basedir, maxlifetime TSRMLS_CC);
+		*nrdels = ps_files_cleanup_dir(data->basedir, maxlifetime);
 
 	return SUCCESS;
 }

ext/session/mod_mm.c

@@ -254,15 +254,11 @@ PHP_MINIT_FUNCTION(ps_mm)
 	int ret;
 
 	ps_mm_instance = calloc(sizeof(*ps_mm_instance), 1);
-   	if (!ps_mm_instance) {
-		php_error(E_WARNING,"mm session save handler cannot allocate shared memory");
+   	if (!ps_mm_instance)
 		return FAILURE;
-	}
 
-	if (!sprintf(euid,"%d", geteuid())) {
-		php_error(E_WARNING,"mm session save handler cannot get effective UID");
+	if (!sprintf(euid,"%d", geteuid())) 
 		return FAILURE;
-	}
 
     /* '/tmp/' + File + Module Name + Effective UID + \0 */	
 	ps_mm_path = do_alloca(5+sizeof(PS_MM_FILE)+mod_name_len+strlen(euid)+1);
@@ -279,7 +275,6 @@ PHP_MINIT_FUNCTION(ps_mm)
 	if (ret != SUCCESS) {
 		free(ps_mm_instance);
 		ps_mm_instance = NULL;
-		php_error(E_NOTICE,"mm session save handler failed to initialize. Check your save_path.");
 		return FAILURE;
 	}
 
@@ -331,10 +326,7 @@ PS_READ_FUNC(mm)
 		(*val)[sd->datalen] = '\0';
 		ret = SUCCESS;
 	}
-	else {
-		*val = estrdup("");
-	}
-	
+
 	mm_unlock(data->mm);
 
 	return ret;

ext/session/mod_user.c

@@ -51,10 +51,11 @@ ps_module ps_mod_user = {
 }
 
 
-static zval *ps_call_handler(zval *func, int argc, zval **argv TSRMLS_DC)
+static zval *ps_call_handler(zval *func, int argc, zval **argv)
 {
 	int i;
 	zval *retval = NULL;
+	TSRMLS_FETCH();
 
 	MAKE_STD_ZVAL(retval);
 	if (call_user_function(EG(function_table), NULL, func, retval, 
@@ -95,7 +96,7 @@ PS_OPEN_FUNC(user)
 	SESS_ZVAL_STRING(save_path, args[0]);
 	SESS_ZVAL_STRING(session_name, args[1]);
 
-	retval = ps_call_handler(PSF(open), 2, args TSRMLS_CC);
+	retval = ps_call_handler(PSF(open), 2, args);
 
 	FINISH;
 }
@@ -105,7 +106,7 @@ PS_CLOSE_FUNC(user)
 	int i;
 	STDVARS;
 
-	retval = ps_call_handler(PSF(close), 0, NULL TSRMLS_CC);
+	retval = ps_call_handler(PSF(close), 0, NULL);
 
 	for (i = 0; i < 6; i++)
 		zval_ptr_dtor(&mdata->names[i]);
@@ -123,7 +124,7 @@ PS_READ_FUNC(user)
 
 	SESS_ZVAL_STRING(key, args[0]);
 
-	retval = ps_call_handler(PSF(read), 1, args TSRMLS_CC);
+	retval = ps_call_handler(PSF(read), 1, args);
 
 	if (retval) {
 		if (Z_TYPE_P(retval) == IS_STRING) {
@@ -145,7 +146,7 @@ PS_WRITE_FUNC(user)
 	SESS_ZVAL_STRING(key, args[0]);
 	SESS_ZVAL_STRINGN(val, vallen, args[1]);
 
-	retval = ps_call_handler(PSF(write), 2, args TSRMLS_CC);
+	retval = ps_call_handler(PSF(write), 2, args);
 
 	FINISH;
 }
@@ -157,7 +158,7 @@ PS_DESTROY_FUNC(user)
 
 	SESS_ZVAL_STRING(key, args[0]);
 
-	retval = ps_call_handler(PSF(destroy), 1, args TSRMLS_CC);
+	retval = ps_call_handler(PSF(destroy), 1, args);
 
 	FINISH;
 }
@@ -169,7 +170,7 @@ PS_GC_FUNC(user)
 
 	SESS_ZVAL_LONG(maxlifetime, args[0]);
 
-	retval = ps_call_handler(PSF(gc), 1, args TSRMLS_CC);
+	retval = ps_call_handler(PSF(gc), 1, args);
 
 	FINISH;
 }

ext/session/php_session.h

@@ -21,12 +21,12 @@
 
 #include "ext/standard/php_var.h"
 
-#define PS_OPEN_ARGS void **mod_data, const char *save_path, const char *session_name TSRMLS_DC
-#define PS_CLOSE_ARGS void **mod_data TSRMLS_DC
-#define PS_READ_ARGS void **mod_data, const char *key, char **val, int *vallen TSRMLS_DC
-#define PS_WRITE_ARGS void **mod_data, const char *key, const char *val, const int vallen TSRMLS_DC
-#define PS_DESTROY_ARGS void **mod_data, const char *key TSRMLS_DC
-#define PS_GC_ARGS void **mod_data, int maxlifetime, int *nrdels TSRMLS_DC
+#define PS_OPEN_ARGS void **mod_data, const char *save_path, const char *session_name
+#define PS_CLOSE_ARGS void **mod_data
+#define PS_READ_ARGS void **mod_data, const char *key, char **val, int *vallen
+#define PS_WRITE_ARGS void **mod_data, const char *key, const char *val, const int vallen
+#define PS_DESTROY_ARGS void **mod_data, const char *key
+#define PS_GC_ARGS void **mod_data, int maxlifetime, int *nrdels
 
 typedef struct ps_module_struct {
 	const char *name;