|
Lines 79-82
Link Here
|
| 79 |
static void noticeHandler(const char *fmt, ...) |
79 |
static void noticeHandler(const char *fmt, ...) |
| 80 |
{ |
80 |
{ |
|
|
81 |
TSRMLS_FETCH(); |
| 81 |
char message[256]; |
82 |
char message[256]; |
| 82 |
va_list args; |
83 |
va_list args; |
|
Lines 90-93
Link Here
|
| 90 |
static void errorHandler(const char *fmt, ...) |
91 |
static void errorHandler(const char *fmt, ...) |
| 91 |
{ |
92 |
{ |
|
|
93 |
TSRMLS_FETCH(); |
| 92 |
char message[256]; |
94 |
char message[256]; |
| 93 |
va_list args; |
95 |
va_list args; |
|
Lines 97-101
Link Here
|
| 97 |
|
99 |
|
| 98 |
/* TODO: use a GEOSException ? */ |
100 |
/* TODO: use a GEOSException ? */ |
| 99 |
zend_throw_exception_ex(zend_exception_get_default(TSRMLS_CC), |
101 |
zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C), |
| 100 |
1 TSRMLS_CC, "%s", message); |
102 |
1 TSRMLS_CC, "%s", message); |
| 101 |
|
103 |
|
|
Lines 109-112
Link Here
|
| 109 |
static void |
111 |
static void |
| 110 |
setRelay(zval* val, void* obj) { |
112 |
setRelay(zval* val, void* obj) { |
|
|
113 |
TSRMLS_FETCH(); |
| 111 |
Proxy* proxy = (Proxy*)zend_object_store_get_object(val TSRMLS_CC); |
114 |
Proxy* proxy = (Proxy*)zend_object_store_get_object(val TSRMLS_CC); |
| 112 |
proxy->relay = obj; |
115 |
proxy->relay = obj; |
|
Lines 115-118
Link Here
|
| 115 |
static inline void * |
118 |
static inline void * |
| 116 |
getRelay(zval* val, zend_class_entry* ce) { |
119 |
getRelay(zval* val, zend_class_entry* ce) { |
|
|
120 |
TSRMLS_FETCH(); |
| 117 |
Proxy *proxy = (Proxy*)zend_object_store_get_object(val TSRMLS_CC); |
121 |
Proxy *proxy = (Proxy*)zend_object_store_get_object(val TSRMLS_CC); |
| 118 |
if ( proxy->std.ce != ce ) { |
122 |
if ( proxy->std.ce != ce ) { |
|
Lines 154-160
Link Here
|
| 154 |
|
158 |
|
| 155 |
static zend_object_value |
159 |
static zend_object_value |
| 156 |
Gen_create_obj (zend_class_entry *type TSRMLS_DC, |
160 |
Gen_create_obj (zend_class_entry *type, |
| 157 |
zend_objects_free_object_storage_t st, zend_object_handlers* handlers) |
161 |
zend_objects_free_object_storage_t st, zend_object_handlers* handlers) |
| 158 |
{ |
162 |
{ |
|
|
163 |
TSRMLS_FETCH(); |
| 159 |
zval *tmp; |
164 |
zval *tmp; |
| 160 |
zend_object_value retval; |
165 |
zend_object_value retval; |
|
Lines 412-415
Link Here
|
| 412 |
dumpGeometry(GEOSGeometry* g, zval* array) |
417 |
dumpGeometry(GEOSGeometry* g, zval* array) |
| 413 |
{ |
418 |
{ |
|
|
419 |
TSRMLS_FETCH(); |
| 414 |
int ngeoms, i; |
420 |
int ngeoms, i; |
| 415 |
|
421 |
|
