Make resource names consistent (#92)

mlazdans · mlazdans · commit 5c473378e16c · 2025-11-09T14:37:52.000+02:00
diff --git a/ibase_blobs.c b/ibase_blobs.c
@@ -72,7 +72,7 @@ static void _php_ibase_free_blob(zend_resource *rsrc) /* {{{ */
 void php_ibase_blobs_minit(INIT_FUNC_ARGS) /* {{{ */
 {
 	le_blob = zend_register_list_destructors_ex(_php_ibase_free_blob, NULL,
-	    "interbase blob", module_number);
+		LE_BLOB, module_number);
 }
 /* }}} */
 
diff --git a/ibase_events.c b/ibase_events.c
@@ -97,7 +97,7 @@ static void _php_ibase_free_event_rsrc(zend_resource *rsrc) /* {{{ */
 void php_ibase_events_minit(INIT_FUNC_ARGS) /* {{{ */
 {
 	le_event = zend_register_list_destructors_ex(_php_ibase_free_event_rsrc, NULL,
-	    "interbase event", module_number);
+		LE_EVENT, module_number);
 }
 /* }}} */
 
diff --git a/ibase_query.c b/ibase_query.c
@@ -57,8 +57,6 @@ typedef struct {
 
 static int le_query;
 
-#define LE_QUERY "Firebird/InterBase query"
-
 static void _php_ibase_alloc_xsqlda_vars(XSQLDA *sqlda, ISC_SHORT *nullinds);
 static void _php_ibase_free_xsqlda(XSQLDA *sqlda) /* {{{ */
 {
@@ -111,7 +109,7 @@ void php_ibase_query_minit(INIT_FUNC_ARGS) /* {{{ */
 {
 	(void)type;
 	le_query = zend_register_list_destructors_ex(php_ibase_free_query_rsrc, NULL,
-		"interbase query", module_number);
+		LE_QUERY, module_number);
 }
 /* }}} */
 
diff --git a/ibase_service.c b/ibase_service.c
@@ -71,7 +71,7 @@ static void _php_ibase_free_service(zend_resource *rsrc) /* {{{ */
 void php_ibase_service_minit(INIT_FUNC_ARGS) /* {{{ */
 {
 	le_service = zend_register_list_destructors_ex(_php_ibase_free_service, NULL,
-	    "interbase service manager handle", module_number);
+		LE_SCVH, module_number);
 
 	/* backup options */
 	REGISTER_LONG_CONSTANT("IBASE_BKP_IGNORE_CHECKSUMS", isc_spb_bkp_ignore_checksums, CONST_PERSISTENT);
diff --git a/php_ibase_includes.h b/php_ibase_includes.h
@@ -54,9 +54,13 @@
 
 extern int le_link, le_plink, le_trans;
 
-#define LE_LINK "Firebird/InterBase link"
+#define LE_LINK  "Firebird/InterBase link"
 #define LE_PLINK "Firebird/InterBase persistent link"
 #define LE_TRANS "Firebird/InterBase transaction"
+#define LE_EVENT "Firebird/InterBase blob"
+#define LE_BLOB  "Firebird/InterBase event"
+#define LE_QUERY "Firebird/InterBase query"
+#define LE_SCVH  "Firebird/InterBase service manager handle"
 
 #define IBASE_MSGSIZE 512
 #define MAX_ERRMSG (IBASE_MSGSIZE*2)

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ static void _php_ibase_free_blob(zend_resource rsrc) / {{{ */`
`72`	`72`	`void php_ibase_blobs_minit(INIT_FUNC_ARGS) /* {{{ */`
`73`	`73`	`{`
`74`	`74`	`le_blob = zend_register_list_destructors_ex(_php_ibase_free_blob, NULL,`
`75`		`- "interbase blob", module_number);`
	`75`	`+ LE_BLOB, module_number);`
`76`	`76`	`}`
`77`	`77`	`/* }}} */`
`78`	`78`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ static void _php_ibase_free_event_rsrc(zend_resource rsrc) / {{{ */`
`97`	`97`	`void php_ibase_events_minit(INIT_FUNC_ARGS) /* {{{ */`
`98`	`98`	`{`
`99`	`99`	`le_event = zend_register_list_destructors_ex(_php_ibase_free_event_rsrc, NULL,`
`100`		`- "interbase event", module_number);`
	`100`	`+ LE_EVENT, module_number);`
`101`	`101`	`}`
`102`	`102`	`/* }}} */`
`103`	`103`
Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,6 @@ typedef struct {`
`57`	`57`
`58`	`58`	`static int le_query;`
`59`	`59`
`60`		`-#define LE_QUERY "Firebird/InterBase query"`
`61`		`-`
`62`	`60`	`static void _php_ibase_alloc_xsqlda_vars(XSQLDA sqlda, ISC_SHORT nullinds);`
`63`	`61`	`static void _php_ibase_free_xsqlda(XSQLDA sqlda) / {{{ */`
`64`	`62`	`{`
`@@ -111,7 +109,7 @@ void php_ibase_query_minit(INIT_FUNC_ARGS) /* {{{ */`
`111`	`109`	`{`
`112`	`110`	`(void)type;`
`113`	`111`	`le_query = zend_register_list_destructors_ex(php_ibase_free_query_rsrc, NULL,`
`114`		`- "interbase query", module_number);`
	`112`	`+ LE_QUERY, module_number);`
`115`	`113`	`}`
`116`	`114`	`/* }}} */`
`117`	`115`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ static void _php_ibase_free_service(zend_resource rsrc) / {{{ */`
`71`	`71`	`void php_ibase_service_minit(INIT_FUNC_ARGS) /* {{{ */`
`72`	`72`	`{`
`73`	`73`	`le_service = zend_register_list_destructors_ex(_php_ibase_free_service, NULL,`
`74`		`- "interbase service manager handle", module_number);`
	`74`	`+ LE_SCVH, module_number);`
`75`	`75`
`76`	`76`	`/* backup options */`
`77`	`77`	`REGISTER_LONG_CONSTANT("IBASE_BKP_IGNORE_CHECKSUMS", isc_spb_bkp_ignore_checksums, CONST_PERSISTENT);`