Minor cleanup

laruence · Apr 11, 2020 · 99983f8 · 99983f8
1 parent 548e82b
commit 99983f8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/yaf_controller.c b/yaf_controller.c
@@ -383,7 +383,6 @@ static zend_object *yaf_controller_new(zend_class_entry *ce) /* {{{ */ {
 		ctl->flags = (zend_uchar)YAF_CTL_AUTORENDER_DEPEND;
 	}
 	ctl->std.handlers = &yaf_controller_obj_handlers;
-	ctl->properties = NULL;
 
 	return &ctl->std;
 }

diff --git a/yaf_controller.h b/yaf_controller.h
@@ -29,21 +29,22 @@ typedef struct {
 	zend_uchar      flags;
 	zend_string    *module;
 	zend_string    *name;
-	zend_string    *script_path;
-	zend_array     *invoke_args;
 	yaf_request_t  *request;
 	yaf_response_t *response;
 	yaf_view_t     *view;
+	zend_string    *script_path;
 	struct {
 		yaf_controller_t ctl;
 		zend_string     *name;
 	} ctl;
+	zend_array     *invoke_args;
 	zend_array     *properties;
 	zend_object     std;
 } yaf_controller_object;
 
 #define Z_YAFCTLOBJ(zv)    (php_yaf_controller_fetch_object(Z_OBJ(zv)))
 #define Z_YAFCTLOBJ_P(zv)  Z_YAFCTLOBJ(*zv)
+
 static zend_always_inline yaf_controller_object *php_yaf_controller_fetch_object(zend_object *obj) {
 	return (yaf_controller_object *)((char*)(obj) - XtOffsetOf(yaf_controller_object, std));
 }