Remove useless TSRM from the stomp_close

v1.1
Pierrick Charron 2009-12-27 18:48:22 +00:00
parent 5940fe8264
commit 26427f95cd
3 changed files with 7 additions and 7 deletions

View File

@ -284,7 +284,7 @@ static void php_destroy_stomp_res(zend_rsrc_list_entry *rsrc TSRMLS_DC)
{
stomp_t *stomp = (stomp_t *) rsrc->ptr;
stomp_send_disconnect(stomp TSRMLS_CC);
stomp_close(stomp TSRMLS_CC);
stomp_close(stomp);
}
static void stomp_object_free_storage(stomp_object_t *intern TSRMLS_DC)
@ -292,7 +292,7 @@ static void stomp_object_free_storage(stomp_object_t *intern TSRMLS_DC)
zend_object_std_dtor(&intern->std TSRMLS_CC);
if (intern->stomp) {
stomp_send_disconnect(intern->stomp TSRMLS_CC);
stomp_close(intern->stomp TSRMLS_CC);
stomp_close(intern->stomp);
}
efree(intern);
}
@ -505,7 +505,7 @@ PHP_FUNCTION(stomp_connect)
} else {
stomp_object_t *i_obj = (stomp_object_t *) zend_object_store_get_object(stomp_object TSRMLS_CC);
if (i_obj->stomp) {
stomp_close(i_obj->stomp TSRMLS_CC);
stomp_close(i_obj->stomp);
}
i_obj->stomp = stomp;
RETURN_TRUE;
@ -515,7 +515,7 @@ PHP_FUNCTION(stomp_connect)
STOMP_ERROR(0, stomp->error);
}
stomp_close(stomp TSRMLS_CC);
stomp_close(stomp);
RETURN_FALSE;
}
/* }}} */
@ -573,7 +573,7 @@ PHP_FUNCTION(stomp_close)
stomp_object_t *i_obj = NULL;
FETCH_STOMP_OBJECT;
stomp_send_disconnect(stomp TSRMLS_CC);
stomp_close(stomp TSRMLS_CC);
stomp_close(stomp);
i_obj->stomp = NULL;
} else {
zval *arg = NULL;

View File

@ -148,7 +148,7 @@ int stomp_connect(stomp_t *stomp TSRMLS_DC)
/* {{{ stomp_close
*/
void stomp_close(stomp_t *stomp TSRMLS_DC)
void stomp_close(stomp_t *stomp)
{
if (NULL == stomp) {
return;

View File

@ -62,7 +62,7 @@ typedef struct _stomp_frame {
stomp_t *stomp_new(const char *host, unsigned short port, long read_timeout_sec, long read_timeout_usec);
int stomp_connect(stomp_t *stomp TSRMLS_DC);
void stomp_close(stomp_t *stomp TSRMLS_DC);
void stomp_close(stomp_t *stomp);
int stomp_send(stomp_t *connection, stomp_frame_t *frame TSRMLS_DC);
stomp_frame_t *stomp_read_frame(stomp_t *connection);
int stomp_valid_receipt(stomp_t *connection, stomp_frame_t *frame);