IntlDatePatternGenerator: coding style

Author: Mel Dafert

ext/intl/dateformat/datepatterngenerator_class.cpp

@@ -36,16 +36,13 @@ zend_object_handlers IntlDatePatternGenerator_handlers;
 
 static zend_object *IntlDatePatternGenerator_object_clone(zend_object *object)
 {
-	IntlDatePatternGenerator_object		*dtpgo_orig,
-											*dtpgo_new;
-	zend_object								*ret_val;
 	intl_error_reset(NULL);
 
-	dtpgo_orig = php_intl_datepatterngenerator_fetch_object(object);
+	IntlDatePatternGenerator_object *dtpgo_orig = php_intl_datepatterngenerator_fetch_object(object);
 	intl_error_reset(DTPATTERNGEN_ERROR_P(dtpgo_orig));
 
-	ret_val = IntlDatePatternGenerator_ce_ptr->create_object(object->ce);
-	dtpgo_new  = php_intl_datepatterngenerator_fetch_object(ret_val);
+	zend_object *ret_val = IntlDatePatternGenerator_ce_ptr->create_object(object->ce);
+	IntlDatePatternGenerator_object *dtpgo_new  = php_intl_datepatterngenerator_fetch_object(ret_val);
 
 	zend_objects_clone_members(&dtpgo_new->zo, &dtpgo_orig->zo);
 
@@ -94,13 +91,13 @@ static void IntlDatePatternGenerator_object_free(zend_object *object)
 
 static zend_object *IntlDatePatternGenerator_object_create(zend_class_entry *ce)
 {
-	IntlDatePatternGenerator_object *intern = zend_object_alloc(sizeof(IntlDatePatternGenerator_object), ce);
+	IntlDatePatternGenerator_object *intern =
+		(IntlDatePatternGenerator_object*) zend_object_alloc(sizeof(IntlDatePatternGenerator_object), ce);
 
 	zend_object_std_init(&intern->zo, ce);
 	object_properties_init(&intern->zo, ce);
 	IntlDatePatternGenerator_object_init(intern);
 
-
 	intern->zo.handlers = &IntlDatePatternGenerator_handlers;
 
 	return &intern->zo;

ext/intl/dateformat/datepatterngenerator_class.h

@@ -15,9 +15,6 @@
 #ifndef DATEPATTERNGENERATOR_CLASS_H
 #define DATEPATTERNGENERATOR_CLASS_H
 
-//redefinition of inline in PHP headers causes problems, so include this before
-#include <math.h>
-
 #include <php.h>
 #include "intl_common.h"
 #include "intl_error.h"
@@ -31,7 +28,7 @@ using icu::DateTimePatternGenerator;
 
 typedef struct {
 	// 	error handling
-	intl_error  err;
+	intl_error err;
 
 	// ICU break iterator
 	DateTimePatternGenerator *dtpg;
@@ -42,7 +39,7 @@ typedef struct {
 static inline IntlDatePatternGenerator_object *php_intl_datepatterngenerator_fetch_object(zend_object *obj) {
 	return (IntlDatePatternGenerator_object *)((char*)(obj) - XtOffsetOf(IntlDatePatternGenerator_object, zo));
 }
-#define Z_INTL_DATETIMEPATTERNGENERATOR_P(zv) php_intl_datepatterngenerator_fetch_object(Z_OBJ_P(zv))
+#define Z_INTL_DATEPATTERNGENERATOR_P(zv) php_intl_datepatterngenerator_fetch_object(Z_OBJ_P(zv))
 
 #define DTPATTERNGEN_ERROR(dtpgo)		(dtpgo)->err
 #define DTPATTERNGEN_ERROR_P(dtpgo)		&(DTPATTERNGEN_ERROR(dtpgo))
@@ -51,7 +48,7 @@ static inline IntlDatePatternGenerator_object *php_intl_datepatterngenerator_fet
 #define DTPATTERNGEN_ERROR_CODE_P(dtpgo)	&(INTL_ERROR_CODE(DTPATTERNGEN_ERROR(dtpgo)))
 
 #define DTPATTERNGEN_METHOD_INIT_VARS		        INTL_METHOD_INIT_VARS(IntlDatePatternGenerator, dtpgo)
-#define DTPATTERNGEN_METHOD_FETCH_OBJECT_NO_CHECK	INTL_METHOD_FETCH_OBJECT(INTL_DATETIMEPATTERNGENERATOR, dtpgo)
+#define DTPATTERNGEN_METHOD_FETCH_OBJECT_NO_CHECK	INTL_METHOD_FETCH_OBJECT(INTL_DATEPATTERNGENERATOR, dtpgo)
 #define DTPATTERNGEN_METHOD_FETCH_OBJECT \
 	DTPATTERNGEN_METHOD_FETCH_OBJECT_NO_CHECK; \
 	if (dtpgo->dtpg == NULL) \

ext/intl/dateformat/datepatterngenerator_methods.cpp

@@ -32,14 +32,12 @@ using icu::StringPiece;
 
 static zend_result dtpg_ctor(INTERNAL_FUNCTION_PARAMETERS)
 {
-	zval		*object;
-	char		*locale_str;
-	size_t		locale_len	= 0;
-	Locale		locale;
+	char *locale_str;
+	size_t locale_len = 0;
 	IntlDatePatternGenerator_object* dtpgo;
 
 	intl_error_reset(NULL);
-	object = return_value;
+	zval *object = return_value;
 
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
@@ -57,7 +55,7 @@ static zend_result dtpg_ctor(INTERNAL_FUNCTION_PARAMETERS)
 	if (locale_len == 0) {
 		locale_str = (char *) intl_locale_get_default();
 	}
-	locale = Locale::createFromName(locale_str);
+	Locale locale = Locale::createFromName(locale_str);
 
 	dtpgo->dtpg = DateTimePatternGenerator::createInstance(
 		locale,
@@ -67,11 +65,10 @@ static zend_result dtpg_ctor(INTERNAL_FUNCTION_PARAMETERS)
 		intl_error_set(NULL, DTPATTERNGEN_ERROR_CODE(dtpgo),
 				"Error creating DateTimePatternGenerator",
 				0);
-		goto error;
+		return FAILURE;
 	}
 
-error:
-	return U_FAILURE(intl_error_get_code(NULL)) ? FAILURE : SUCCESS;
+	return SUCCESS;
 }
 
 U_CFUNC PHP_METHOD( IntlDatePatternGenerator, create )
@@ -107,7 +104,6 @@ U_CFUNC PHP_METHOD( IntlDatePatternGenerator, getBestPattern )
 	char			*skeleton_str	= NULL;
 	size_t			skeleton_len;
 	UnicodeString	skeleton_uncleaned;
-	UnicodeString	skeleton;
 
 	DTPATTERNGEN_METHOD_INIT_VARS;
 
@@ -124,22 +120,17 @@ U_CFUNC PHP_METHOD( IntlDatePatternGenerator, getBestPattern )
 
 	INTL_METHOD_CHECK_STATUS(dtpgo, "Skeleton is not a valid UTF-8 string");
 
-	skeleton = dtpgo->dtpg->getSkeleton(skeleton_uncleaned, DTPATTERNGEN_ERROR_CODE(dtpgo));
+	UnicodeString skeleton = dtpgo->dtpg->getSkeleton(skeleton_uncleaned, DTPATTERNGEN_ERROR_CODE(dtpgo));
 
 	INTL_METHOD_CHECK_STATUS(dtpgo, "Error getting cleaned skeleton");
 
-	{
-		zend_string *u8str;
-		UnicodeString result;
-
-		result = dtpgo->dtpg->getBestPattern(skeleton, DTPATTERNGEN_ERROR_CODE(dtpgo));
+	UnicodeString result = dtpgo->dtpg->getBestPattern(skeleton, DTPATTERNGEN_ERROR_CODE(dtpgo));
 
-		INTL_METHOD_CHECK_STATUS(dtpgo, "Error retrieving pattern");
+	INTL_METHOD_CHECK_STATUS(dtpgo, "Error retrieving pattern");
 
-		u8str = intl_charFromString(result, DTPATTERNGEN_ERROR_CODE_P(dtpgo));
+	zend_string *u8str = intl_charFromString(result, DTPATTERNGEN_ERROR_CODE_P(dtpgo));
 
-		INTL_METHOD_CHECK_STATUS(dtpgo, "Error converting result to UTF-8");
+	INTL_METHOD_CHECK_STATUS(dtpgo, "Error converting result to UTF-8");
 
-		RETVAL_STR(u8str);
-	}
+	RETVAL_STR(u8str);
 }