consolidate ws

Author: m6w6

msgpack.c

@@ -225,12 +225,12 @@ static ZEND_METHOD(msgpack, pack) /* {{{ */ {
     php_msgpack_serialize(&buf, parameter);
 
     MSGPACK_G(php_only) = php_only;
-	if (buf.s) {
-		smart_str_0(&buf);
-		ZVAL_STR(return_value, buf.s);
-	} else {
-		RETURN_EMPTY_STRING();
-	}
+    if (buf.s) {
+        smart_str_0(&buf);
+        ZVAL_STR(return_value, buf.s);
+    } else {
+        RETURN_EMPTY_STRING();
+    }
 
 }
 /* }}} */
@@ -260,7 +260,7 @@ static ZEND_METHOD(msgpack, unpack) /* {{{ */ {
         if (msgpack_convert_template(return_value, object, &zv) != SUCCESS) {
             RETVAL_NULL();
         }
-		zval_ptr_dtor(&zv);
+        zval_ptr_dtor(&zv);
     }
 
     MSGPACK_G(php_only) = php_only;
@@ -309,7 +309,7 @@ static ZEND_METHOD(msgpack_unpacker, __construct) /* {{{ */ {
 static ZEND_METHOD(msgpack_unpacker, __destruct) /* {{{ */ {
     php_msgpack_unpacker_t *unpacker = Z_MSGPACK_UNPACKER_P(getThis());
     smart_str_free(&unpacker->buffer);
-	zval_ptr_dtor(&unpacker->retval);
+    zval_ptr_dtor(&unpacker->retval);
     msgpack_unserialize_var_destroy(&unpacker->var_hash, unpacker->error);
 }
 /* }}} */
@@ -359,7 +359,7 @@ static ZEND_METHOD(msgpack_unpacker, feed) /* {{{ */ {
 static ZEND_METHOD(msgpack_unpacker, execute) /* {{{ */ {
     char *data;
     size_t len, off;
-	zend_string *str = NULL;
+    zend_string *str = NULL;
     int ret, error_display = MSGPACK_G(error_display), php_only = MSGPACK_G(php_only);
     zval *offset = NULL;
     php_msgpack_unpacker_t *unpacker = Z_MSGPACK_UNPACKER_P(getThis());
@@ -381,10 +381,10 @@ static ZEND_METHOD(msgpack_unpacker, execute) /* {{{ */ {
         len = ZSTR_LEN(unpacker->buffer.s);
         off = unpacker->offset;
     } else {
-		data = NULL;
-		len = 0;
-		off = 0;
-	}
+        data = NULL;
+        len = 0;
+        off = 0;
+    }
 
     if (unpacker->finished) {
         msgpack_unserialize_var_destroy(&unpacker->var_hash, unpacker->error);
@@ -420,41 +420,41 @@ static ZEND_METHOD(msgpack_unpacker, execute) /* {{{ */ {
         case MSGPACK_UNPACK_SUCCESS:
             unpacker->finished = 1;
             unpacker->error = 0;
-			RETURN_TRUE;
+            RETURN_TRUE;
         default:
             unpacker->error = 1;
-    		RETURN_FALSE;
+            RETURN_FALSE;
     }
 }
 /* }}} */
 
 static ZEND_METHOD(msgpack_unpacker, data) /* {{{ */ {
-	zval *object = NULL;
-	php_msgpack_unpacker_t *unpacker = Z_MSGPACK_UNPACKER_P(getThis());
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|z", &object) == FAILURE) {
-		return;
-	}
-
-	if (unpacker->finished) {
-		if (object == NULL) {
-			ZVAL_COPY_VALUE(return_value, &unpacker->retval);
-		} else {
-			zval zv;
-			ZVAL_COPY_VALUE(&zv, &unpacker->retval);
-
-			if (msgpack_convert_object(return_value, object, &zv) != SUCCESS) {
-				zval_ptr_dtor(&zv);
-				RETURN_NULL();
-			}
-			zval_ptr_dtor(&zv);
-		}
-		ZVAL_UNDEF(&unpacker->retval);
-	} else {
-		RETURN_FALSE;
-	}
-
-	ZEND_MN(msgpack_unpacker_reset)(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+    zval *object = NULL;
+    php_msgpack_unpacker_t *unpacker = Z_MSGPACK_UNPACKER_P(getThis());
+
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "|z", &object) == FAILURE) {
+        return;
+    }
+
+    if (unpacker->finished) {
+        if (object == NULL) {
+            ZVAL_COPY_VALUE(return_value, &unpacker->retval);
+        } else {
+            zval zv;
+            ZVAL_COPY_VALUE(&zv, &unpacker->retval);
+
+            if (msgpack_convert_object(return_value, object, &zv) != SUCCESS) {
+                zval_ptr_dtor(&zv);
+                RETURN_NULL();
+            }
+            zval_ptr_dtor(&zv);
+        }
+        ZVAL_UNDEF(&unpacker->retval);
+    } else {
+        RETURN_FALSE;
+    }
+
+    ZEND_MN(msgpack_unpacker_reset)(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
 /* }}} */