Address review comments. Remove pointless XORing.

Don't move this into a utility function,
it would be the same as `(zend_long)Z_OBJ_HANDLE_P(obj)`

Author: TysonAndre

ext/spl/php_spl.c

@@ -804,22 +804,18 @@ PHP_FUNCTION(spl_object_id)
 		Z_PARAM_OBJECT(obj)
 	ZEND_PARSE_PARAMETERS_END_EX(RETURN_NULL());
 
-	RETURN_LONG(php_spl_object_id(obj));
+	RETURN_LONG((zend_long)Z_OBJ_HANDLE_P(obj));
 }
 /* }}} */
 
-static void php_spl_init_hash_mask() {
-	SPL_G(hash_mask_handle)   = (intptr_t)(php_mt_rand() >> 1);
-	SPL_G(hash_mask_handlers) = (intptr_t)(php_mt_rand() >> 1);
-	SPL_G(hash_mask_init) = 1;
-}
-
 PHPAPI zend_string *php_spl_object_hash(zval *obj) /* {{{*/
 {
 	intptr_t hash_handle, hash_handlers;
 
 	if (!SPL_G(hash_mask_init)) {
-		php_spl_init_hash_mask();
+		SPL_G(hash_mask_handle)   = (intptr_t)(php_mt_rand() >> 1);
+		SPL_G(hash_mask_handlers) = (intptr_t)(php_mt_rand() >> 1);
+		SPL_G(hash_mask_init) = 1;
 	}
 
 	hash_handle   = SPL_G(hash_mask_handle)^(intptr_t)Z_OBJ_HANDLE_P(obj);
@@ -829,20 +825,6 @@ PHPAPI zend_string *php_spl_object_hash(zval *obj) /* {{{*/
 }
 /* }}} */
 
-PHPAPI zend_long php_spl_object_id(zval *obj) /* {{{*/
-{
-	intptr_t hash_handle;
-
-	if (!SPL_G(hash_mask_init)) {
-		php_spl_init_hash_mask();
-	}
-
-	hash_handle   = SPL_G(hash_mask_handle)^(intptr_t)Z_OBJ_HANDLE_P(obj);
-
-	return (zend_long) hash_handle;
-}
-/* }}} */
-
 int spl_build_class_list_string(zval *entry, char **list) /* {{{ */
 {
 	char *res;

ext/spl/php_spl.h

@@ -71,7 +71,6 @@ PHP_FUNCTION(class_implements);
 PHP_FUNCTION(class_uses);
 
 PHPAPI zend_string *php_spl_object_hash(zval *obj);
-PHPAPI zend_long php_spl_object_id(zval *obj);
 
 #endif /* PHP_SPL_H */