- TSRMLS_FETCH work

- whitespace fixes

14 files changed, 66 insertions, 64 deletions

diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index 9f642aaf9f..b283de1ea4 100644
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -163,7 +163,7 @@ PHPAPI int php_check_specific_open_basedir(char *basedir, char *path TSRMLS_DC)
 	}
 
 	/* Resolve the real path into resolved_name */
-	if ((expand_filepath(path, resolved_name) != NULL) && (expand_filepath(local_open_basedir, resolved_basedir) != NULL)) {
+	if ((expand_filepath(path, resolved_name TSRMLS_CC) != NULL) && (expand_filepath(local_open_basedir, resolved_basedir TSRMLS_CC) != NULL)) {
 		/* Check the path */
 #ifdef PHP_WIN32
 		if (strncasecmp(resolved_basedir, resolved_name, strlen(resolved_basedir)) == 0) {
@@ -232,7 +232,7 @@ static FILE *php_fopen_and_set_opened_path(const char *path, char *mode, char **
 	}
 	fp = VCWD_FOPEN(path, mode);
 	if (fp && opened_path) {
-		*opened_path = expand_filepath(path, NULL);
+		*opened_path = expand_filepath(path, NULL TSRMLS_CC);
 	}
 	return fp;
 }
@@ -350,7 +350,7 @@ PHPAPI int php_fopen_primary_script(zend_file_handle *file_handle TSRMLS_DC)
 		return FAILURE;
 	}
 
-	file_handle->opened_path = expand_filepath(filename, NULL);
+	file_handle->opened_path = expand_filepath(filename, NULL TSRMLS_CC);
 
     if (!(SG(options) & SAPI_OPTION_NO_CHDIR)) {
 		VCWD_CHDIR_FILE(filename);
@@ -539,7 +539,7 @@ static FILE *php_fopen_url_wrapper(const char *path, char *mode, int options, in
 		}
 	} 
 
-	if (!protocol || !strncasecmp(protocol, "file",n)){
+	if (!protocol || !strncasecmp(protocol, "file", n)){
 		*issock = 0;
 		
 		if(protocol) {
@@ -605,7 +605,7 @@ PHPAPI char *php_strip_url_passwd(char *url)
 
 /* {{{ expand_filepath
  */
-PHPAPI char *expand_filepath(const char *filepath, char *real_path)
+PHPAPI char *expand_filepath(const char *filepath, char *real_path TSRMLS_DC)
 {
 	cwd_state new_state;
 	char cwd[MAXPATHLEN];
diff --git a/main/fopen_wrappers.h b/main/fopen_wrappers.h
index ae8931d149..b46b60f3b4 100644
--- a/main/fopen_wrappers.h
+++ b/main/fopen_wrappers.h
@@ -42,21 +42,21 @@
 # define SOCK_CONN_ERR -1
 # define SOCK_RECV_ERR -1
 #endif
-#define SOCK_WRITE(d,s) send(s,d,strlen(d),0)
-#define SOCK_WRITEL(d,l,s) send(s,d,l,0)
+#define SOCK_WRITE(d, s) send(s, d, strlen(d), 0)
+#define SOCK_WRITEL(d, l, s) send(s, d, l, 0)
 #define SOCK_FGETC(s) php_sock_fgetc((s))
-#define SOCK_FGETS(b,l,s) php_sock_fgets((b),(l),(s))
+#define SOCK_FGETS(b, l, s) php_sock_fgets((b), (l), (s))
 #define SOCK_FEOF(sock) php_sock_feof((sock))
-#define SOCK_FREAD(ptr,size,sock) php_sock_fread((ptr),(size),(sock))
+#define SOCK_FREAD(ptr, size, sock) php_sock_fread((ptr), (size), (sock))
 #define SOCK_FCLOSE(s) php_sock_close(s)
 
-#define FP_FGETS(buf,len,sock,fp,issock) \
-	((issock)?SOCK_FGETS(buf,len,sock):fgets(buf,len,fp))
-#define FP_FREAD(buf,len,sock,fp,issock) \
-	((issock)?SOCK_FREAD(buf,len,sock):fread(buf,1,len,fp))
-#define FP_FEOF(sock,fp,issock) \
+#define FP_FGETS(buf, len, sock, fp, issock) \
+	((issock)?SOCK_FGETS(buf, len, sock):fgets(buf, len, fp))
+#define FP_FREAD(buf, len, sock, fp, issock) \
+	((issock)?SOCK_FREAD(buf, len, sock):fread(buf, 1, len, fp))
+#define FP_FEOF(sock, fp, issock) \
 	((issock)?SOCK_FEOF(sock):feof(fp))
-#define FP_FGETC(sock,fp,issock) \
+#define FP_FGETC(sock, fp, issock) \
 	((issock)?SOCK_FGETC(sock):fgetc(fp))
 
 /* values for issock */
@@ -69,7 +69,7 @@ typedef FILE *(*php_fopen_url_wrapper_t)(const char *, char *, int, int *, int *
 PHPAPI FILE *php_fopen_wrapper(char *filename, char *mode, int options, int *issock, int *socketd, char **opened_path TSRMLS_DC);
 
 PHPAPI int php_fopen_primary_script(zend_file_handle *file_handle TSRMLS_DC);
-PHPAPI char *expand_filepath(const char *filepath, char *real_path);
+PHPAPI char *expand_filepath(const char *filepath, char *real_path TSRMLS_DC);
 
 PHPAPI int php_check_open_basedir(char *path TSRMLS_DC);
 PHPAPI int php_check_specific_open_basedir(char *basedir, char *path TSRMLS_DC);
diff --git a/main/main.c b/main/main.c
index 3202b1a85b..ae64e8c911 100644
--- a/main/main.c
+++ b/main/main.c
@@ -189,7 +189,7 @@ PHP_INI_BEGIN()
 	PHP_INI_ENTRY_EX("highlight.keyword",		HL_KEYWORD_COLOR,	PHP_INI_ALL,	NULL,			php_ini_color_displayer_cb)
 	PHP_INI_ENTRY_EX("highlight.string",		HL_STRING_COLOR,	PHP_INI_ALL,	NULL,			php_ini_color_displayer_cb)
 
-	STD_PHP_INI_BOOLEAN("allow_call_time_pass_reference","1",PHP_INI_SYSTEM|PHP_INI_PERDIR,		OnUpdateBool,	allow_call_time_pass_reference,	zend_compiler_globals,	compiler_globals)
+	STD_PHP_INI_BOOLEAN("allow_call_time_pass_reference",	"1",	PHP_INI_SYSTEM|PHP_INI_PERDIR,		OnUpdateBool,	allow_call_time_pass_reference,	zend_compiler_globals,	compiler_globals)
 	STD_PHP_INI_BOOLEAN("asp_tags",				"0",		PHP_INI_SYSTEM|PHP_INI_PERDIR,		OnUpdateBool,			asp_tags,				zend_compiler_globals,	compiler_globals)
 	STD_PHP_INI_BOOLEAN("display_errors",		"1",		PHP_INI_ALL,		OnUpdateBool,			display_errors,			php_core_globals,	core_globals)
 	STD_PHP_INI_BOOLEAN("display_startup_errors",	"0",	PHP_INI_ALL,		OnUpdateBool,			display_startup_errors,	php_core_globals,	core_globals)
@@ -602,7 +602,7 @@ static void sigchld_handler(int apar)
 {
     while (waitpid(-1, NULL, WNOHANG) > 0)
 		;
-    signal(SIGCHLD,sigchld_handler);   
+    signal(SIGCHLD, sigchld_handler);   
 }
 /* }}} */
 #endif
@@ -616,7 +616,7 @@ int php_request_startup(TSRMLS_D)
 	int retval = SUCCESS;
 
 #if PHP_SIGCHILD
-	signal(SIGCHLD,sigchld_handler);
+	signal(SIGCHLD, sigchld_handler);
 #endif
 
 	zend_try {
@@ -728,7 +728,7 @@ static int php_body_write_wrapper(const char *str, uint str_length)
  */
 static void core_globals_ctor(php_core_globals *core_globals TSRMLS_DC)
 {
-	memset(core_globals,0,sizeof(*core_globals));
+	memset(core_globals, 0, sizeof(*core_globals));
 }
 /* }}} */
 #endif
@@ -959,10 +959,12 @@ void php_module_shutdown()
 	php_shutdown_fopen_wrappers(TSRMLS_C);
 	php_shutdown_info_logos();
 	UNREGISTER_INI_ENTRIES();
-#ifndef ZTS
+#ifdef ZTS
+	ts_free_thread();
+#else
 	zend_ini_shutdown(TSRMLS_C);
-#endif
 	shutdown_memory_manager(0, 1);
+#endif
 	module_initialized = 0;
 }
 /* }}} */
@@ -1003,7 +1005,7 @@ static inline void php_register_server_variables(TSRMLS_D)
 static int php_hash_environment(TSRMLS_D)
 {
 	char *p;
-	unsigned char _gpc_flags[3] = {0,0,0};
+	unsigned char _gpc_flags[3] = {0, 0, 0};
 	zend_bool have_variables_order;
 	zval *dummy_track_vars_array;
 	zend_bool initialized_dummy_track_vars_array=0;
@@ -1200,7 +1202,7 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC)
 
 	zend_try {
 #ifdef PHP_WIN32
-		UpdateIniFromRegistry(primary_file->filename);
+		UpdateIniFromRegistry(primary_file->filename TSRMLS_CC);
 #endif
 
 		PG(during_request_startup) = 0;
diff --git a/main/output.c b/main/output.c
index 4e52d458f4..fc45807879 100644
--- a/main/output.c
+++ b/main/output.c
@@ -173,12 +173,12 @@ PHPAPI void php_end_ob_buffer(zend_bool send_buffer, zend_bool just_flush)
 		TSRMLS_FETCH();
 
 		ALLOC_INIT_ZVAL(orig_buffer);
-		ZVAL_STRINGL(orig_buffer,OG(active_ob_buffer).buffer,OG(active_ob_buffer).text_length,0);
+		ZVAL_STRINGL(orig_buffer, OG(active_ob_buffer).buffer, OG(active_ob_buffer).text_length, 0);
 		orig_buffer->refcount=2;	/* don't let call_user_function() destroy our buffer */
 		orig_buffer->is_ref=1;
 
 		ALLOC_INIT_ZVAL(z_status);
-		ZVAL_LONG(z_status,status);
+		ZVAL_LONG(z_status, status);
 
 		params[0] = &orig_buffer;
 		params[1] = &z_status;
@@ -415,7 +415,7 @@ int php_ob_get_buffer(pval *p)
 	if (OG(ob_nesting_level)==0) {
 		return FAILURE;
 	}
-	ZVAL_STRINGL(p,OG(active_ob_buffer).buffer,OG(active_ob_buffer).text_length,1);
+	ZVAL_STRINGL(p, OG(active_ob_buffer).buffer, OG(active_ob_buffer).text_length, 1);
 	return SUCCESS;
 }
 /* }}} */
@@ -429,7 +429,7 @@ int php_ob_get_length(pval *p)
 	if (OG(ob_nesting_level) == 0) {
 		return FAILURE;
 	}
-	ZVAL_LONG(p,OG(active_ob_buffer).text_length);
+	ZVAL_LONG(p, OG(active_ob_buffer).text_length);
 	return SUCCESS;
 }
 /* }}} */
diff --git a/main/php.h b/main/php.h
index 34cdeae6e4..aa8395036a 100644
--- a/main/php.h
+++ b/main/php.h
@@ -113,7 +113,7 @@ char *strtok_r(char *s, const char *delim, char **last);
 typedef unsigned int socklen_t;
 #endif
 
-#define CREATE_MUTEX(a,b)
+#define CREATE_MUTEX(a, b)
 #define SET_MUTEX(a)
 #define FREE_MUTEX(a)
 
@@ -303,29 +303,29 @@ PHPAPI int cfg_get_string(char *varname, char **result);
 
 #if defined(CRAY) || (defined(__arm) && !defined(LINUX))
 #ifdef __STDC__
-#define XtOffset(p_type,field) _Offsetof(p_type,field)
+#define XtOffset(p_type, field) _Offsetof(p_type, field)
 #else
 #ifdef CRAY2
-#define XtOffset(p_type,field) \
+#define XtOffset(p_type, field) \
     (sizeof(int)*((unsigned int)&(((p_type)NULL)->field)))
 
 #else /* !CRAY2 */
 
-#define XtOffset(p_type,field) ((unsigned int)&(((p_type)NULL)->field))
+#define XtOffset(p_type, field) ((unsigned int)&(((p_type)NULL)->field))
 
 #endif /* !CRAY2 */
 #endif /* __STDC__ */
 #else /* ! (CRAY || __arm) */
 
-#define XtOffset(p_type,field) \
+#define XtOffset(p_type, field) \
     ((long) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL)))
 
 #endif /* !CRAY */
 
 #ifdef offsetof
-#define XtOffsetOf(s_type,field) offsetof(s_type,field)
+#define XtOffsetOf(s_type, field) offsetof(s_type, field)
 #else
-#define XtOffsetOf(s_type,field) XtOffset(s_type*,field)
+#define XtOffsetOf(s_type, field) XtOffset(s_type*, field)
 #endif
 
 PHPAPI PHP_FUNCTION(warn_not_available);
diff --git a/main/php_content_types.c b/main/php_content_types.c
index 80ef9a8290..aaa06e34a0 100644
--- a/main/php_content_types.c
+++ b/main/php_content_types.c
@@ -40,7 +40,7 @@ SAPI_POST_READER_FUNC(php_default_post_reader)
 	char *data;
 
 	if(!SG(request_info).post_data) sapi_read_standard_form_data(TSRMLS_C);
-	data = estrndup(SG(request_info).post_data,SG(request_info).post_data_length);
+	data = estrndup(SG(request_info).post_data, SG(request_info).post_data_length);
 	SET_VAR_STRINGL("HTTP_RAW_POST_DATA", data, SG(request_info).post_data_length);
 }
 /* }}} */
diff --git a/main/php_ini.c b/main/php_ini.c
index 2d14300b3c..6e6ca748c1 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -228,7 +228,7 @@ int php_init_config(char *php_ini_path_override)
 #ifdef PHP_WIN32
 		default_location = (char *) emalloc(512);
 	
-		if (!GetWindowsDirectory(default_location,255)) {
+		if (!GetWindowsDirectory(default_location, 255)) {
 			default_location[0]=0;
 		}
 		free_default_location=1;
@@ -272,7 +272,7 @@ int php_init_config(char *php_ini_path_override)
 		tmp.value.str.len = strlen(php_ini_opened_path);
 		tmp.value.str.val = zend_strndup(php_ini_opened_path, tmp.value.str.len);
 		tmp.type = IS_STRING;
-		zend_hash_update(&configuration_hash, "cfg_file_path", sizeof("cfg_file_path"),(void *) &tmp,sizeof(zval), NULL);
+		zend_hash_update(&configuration_hash, "cfg_file_path", sizeof("cfg_file_path"), (void *) &tmp, sizeof(zval), NULL);
 		efree(php_ini_opened_path);
 		php_ini_opened_path = zend_strndup(tmp.value.str.val, tmp.value.str.len);
 	}
@@ -321,11 +321,11 @@ zval *cfg_get_entry(char *name, uint name_length)
 
 /* {{{ cfg_get_long
  */
-PHPAPI int cfg_get_long(char *varname,long *result)
+PHPAPI int cfg_get_long(char *varname, long *result)
 {
-	zval *tmp,var;
+	zval *tmp, var;
 	
-	if (zend_hash_find(&configuration_hash,varname,strlen(varname)+1,(void **) &tmp)==FAILURE) {
+	if (zend_hash_find(&configuration_hash, varname, strlen(varname)+1, (void **) &tmp)==FAILURE) {
 		*result=(long)NULL;
 		return FAILURE;
 	}
@@ -339,11 +339,11 @@ PHPAPI int cfg_get_long(char *varname,long *result)
 
 /* {{{ cfg_get_double
  */
-PHPAPI int cfg_get_double(char *varname,double *result)
+PHPAPI int cfg_get_double(char *varname, double *result)
 {
-	zval *tmp,var;
+	zval *tmp, var;
 	
-	if (zend_hash_find(&configuration_hash,varname,strlen(varname)+1,(void **) &tmp)==FAILURE) {
+	if (zend_hash_find(&configuration_hash, varname, strlen(varname)+1, (void **) &tmp)==FAILURE) {
 		*result=(double)0;
 		return FAILURE;
 	}
@@ -361,7 +361,7 @@ PHPAPI int cfg_get_string(char *varname, char **result)
 {
 	zval *tmp;
 
-	if (zend_hash_find(&configuration_hash,varname,strlen(varname)+1,(void **) &tmp)==FAILURE) {
+	if (zend_hash_find(&configuration_hash, varname, strlen(varname)+1, (void **) &tmp)==FAILURE) {
 		*result=NULL;
 		return FAILURE;
 	}
diff --git a/main/php_logos.c b/main/php_logos.c
index eb3c523492..28329234ef 100644
--- a/main/php_logos.c
+++ b/main/php_logos.c
@@ -73,14 +73,14 @@ int php_info_logos(const char *logo_string TSRMLS_DC)
 	char *content_header;
 	int len;
 
-	if(FAILURE==zend_hash_find(&phpinfo_logo_hash,(char *) logo_string,strlen(logo_string),(void **)&logo_image))
+	if(FAILURE==zend_hash_find(&phpinfo_logo_hash, (char *) logo_string, strlen(logo_string), (void **)&logo_image))
 		return 0;
 
 	len=strlen(CONTENT_TYPE_HEADER)+logo_image->mimelen;
 	content_header=malloc(len+1);
 	if(!content_header) return 0;
-	strcpy(content_header,CONTENT_TYPE_HEADER);
-	strcat(content_header,logo_image->mimetype);
+	strcpy(content_header, CONTENT_TYPE_HEADER);
+	strcat(content_header, logo_image->mimetype);
 	sapi_add_header(content_header, len, 1);
 	free(content_header);
 
diff --git a/main/php_open_temporary_file.c b/main/php_open_temporary_file.c
index de4aacc998..ebbc6211f3 100644
--- a/main/php_open_temporary_file.c
+++ b/main/php_open_temporary_file.c
@@ -87,7 +87,7 @@
  * SUCH DAMAGE.
  */
 
-static FILE *php_do_open_temporary_file(char *path, const char *pfx, char **opened_path_p)
+static FILE *php_do_open_temporary_file(char *path, const char *pfx, char **opened_path_p TSRMLS_DC)
 {
 	char *trailing_slash;
 	FILE *fp;
@@ -148,7 +148,7 @@ static FILE *php_do_open_temporary_file(char *path, const char *pfx, char **open
  * This function should do its best to return a file pointer to a newly created
  * unique file, on every platform.
  */
-PHPAPI FILE *php_open_temporary_file(const char *dir, const char *pfx, char **opened_path_p)
+PHPAPI FILE *php_open_temporary_file(const char *dir, const char *pfx, char **opened_path_p TSRMLS_DC)
 {
 	static char path_tmp[] = "/tmp";
 	FILE *fp;
@@ -162,11 +162,11 @@ PHPAPI FILE *php_open_temporary_file(const char *dir, const char *pfx, char **op
 		*opened_path_p = NULL;
 	}
 
-	if ((fp=php_do_open_temporary_file((char *) dir, pfx, opened_path_p))) {
+	if ((fp=php_do_open_temporary_file((char *) dir, pfx, opened_path_p TSRMLS_CC))) {
 		return fp;
 	}
 
-	if ((fp=php_do_open_temporary_file(getenv("TMPDIR"), pfx, opened_path_p))) {
+	if ((fp=php_do_open_temporary_file(getenv("TMPDIR"), pfx, opened_path_p TSRMLS_CC))) {
 		return fp;
 	}
 #if PHP_WIN32
@@ -175,17 +175,17 @@ PHPAPI FILE *php_open_temporary_file(const char *dir, const char *pfx, char **op
 
 		TempPath = (char *) emalloc(MAXPATHLEN);
 		if (GetTempPath(MAXPATHLEN, TempPath)) {
-			fp = php_do_open_temporary_file(TempPath, pfx, opened_path_p);
+			fp = php_do_open_temporary_file(TempPath, pfx, opened_path_p TSRMLS_CC);
 		}
 		efree(TempPath);
 		return fp;
 	}
 #else
-	if ((fp=php_do_open_temporary_file(P_tmpdir, pfx, opened_path_p))) {
+	if ((fp=php_do_open_temporary_file(P_tmpdir, pfx, opened_path_p TSRMLS_CC))) {
 		return fp;
 	}
 
-	if ((fp=php_do_open_temporary_file(path_tmp, pfx, opened_path_p))) {
+	if ((fp=php_do_open_temporary_file(path_tmp, pfx, opened_path_p TSRMLS_CC))) {
 		return fp;
 	}
 #endif
diff --git a/main/php_open_temporary_file.h b/main/php_open_temporary_file.h
index 38c99cf0aa..743c7cca6b 100644
--- a/main/php_open_temporary_file.h
+++ b/main/php_open_temporary_file.h
@@ -19,6 +19,6 @@
 #ifndef PHP_OPEN_TEMPORARY_FILE_H
 #define PHP_OPEN_TEMPORARY_FILE_H
 
-PHPAPI FILE *php_open_temporary_file(const char *dir, const char *pfx, char **opened_path_p);
+PHPAPI FILE *php_open_temporary_file(const char *dir, const char *pfx, char **opened_path_p TSRMLS_DC);
 
 #endif /* PHP_OPEN_TEMPORARY_FILE_H */
diff --git a/main/php_ticks.c b/main/php_ticks.c
index da0430cd71..684524ea82 100644
--- a/main/php_ticks.c
+++ b/main/php_ticks.c
@@ -53,7 +53,7 @@ PHPAPI void php_remove_tick_function(void (*func)(int))
 	TSRMLS_FETCH();
 
 	zend_llist_del_element(&PG(tick_functions), func,
-						   (int(*)(void*,void*))php_compare_tick_functions);
+						   (int(*)(void*, void*))php_compare_tick_functions);
 }
 
 static void php_tick_iterator(void *data, void *arg TSRMLS_DC)
diff --git a/main/rfc1867.c b/main/rfc1867.c
index 6ad499e5e9..e8efe0851d 100644
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -215,7 +215,7 @@ static void php_mime_split(char *buf, int cnt, char *boundary, zval *array_ptr T
 					if(is_arr_upload) {
 						arr_len = strlen(start_arr);
 						if(arr_index) efree(arr_index);
-						arr_index = estrndup(start_arr+1,arr_len-2);	
+						arr_index = estrndup(start_arr+1, arr_len-2);	
 					}
 				} else {
 					php_error(E_WARNING, "File upload error - no name component in content disposition");
@@ -366,13 +366,13 @@ static void php_mime_split(char *buf, int cnt, char *boundary, zval *array_ptr T
 				}
 				bytes = 0;
 
-				fp = php_open_temporary_file(PG(upload_tmp_dir), "php", &temp_filename);
+				fp = php_open_temporary_file(PG(upload_tmp_dir), "php", &temp_filename TSRMLS_CC);
 				if (!fp) {
 					php_error(E_WARNING, "File upload error - unable to create a temporary file");
 					SAFE_RETURN;
 				}
 				if ((loc - ptr - 4) > PG(upload_max_filesize)) {
-					php_error(E_WARNING, "Max file size of %ld bytes exceeded - file [%s] not saved", PG(upload_max_filesize),namebuf);
+					php_error(E_WARNING, "Max file size of %ld bytes exceeded - file [%s] not saved", PG(upload_max_filesize), namebuf);
 					upload_successful = 0;
 				} else if (max_file_size && ((loc - ptr - 4) > max_file_size)) {
 					php_error(E_WARNING, "Max file size exceeded - file [%s] not saved", namebuf);
diff --git a/main/safe_mode.c b/main/safe_mode.c
index 675a3d7ab4..f570ca80fc 100644
--- a/main/safe_mode.c
+++ b/main/safe_mode.c
@@ -68,7 +68,7 @@ PHPAPI int php_checkuid(const char *filename, char *fopen_mode, int mode)
 	 * If given filepath is a URL, allow - safe mode stuff
 	 * related to URL's is checked in individual functions
      */	
-	if (!strncasecmp(filename,"http://",7) || !strncasecmp(filename,"ftp://",6)) {
+	if (!strncasecmp(filename,"http://", 7) || !strncasecmp(filename,"ftp://", 6)) {
 		return 1;
 	}
 		
@@ -97,11 +97,11 @@ PHPAPI int php_checkuid(const char *filename, char *fopen_mode, int mode)
 		}
 
 		/* Trim off filename */
-		if ((s = strrchr(path,DEFAULT_SLASH))) {
+		if ((s = strrchr(path, DEFAULT_SLASH))) {
 			*s = '\0';
 		}
 	} else { /* CHECKUID_ALLOW_ONLY_DIR */
-		s = strrchr(filename,DEFAULT_SLASH);
+		s = strrchr(filename, DEFAULT_SLASH);
 
 		if (s) {
 			*s = '\0';
diff --git a/main/win95nt.h b/main/win95nt.h
index bc0e83b4b7..16412f9f05 100644
--- a/main/win95nt.h
+++ b/main/win95nt.h
@@ -19,7 +19,7 @@ typedef char * caddr_t;
 #define S_IFBLK		_IFBLK
 #define	S_IFLNK		_IFLNK
 #define chdir(path) SetCurrentDirectory(path)
-#define mkdir(a,b)	_mkdir(a)
+#define mkdir(a, b)	_mkdir(a)
 #define rmdir(a)	_rmdir(a)
 #define getpid		_getpid
 #define php_sleep(t)	Sleep(t*1000)