Skip to content

Commit bd3231a

Browse files
arnaud-lbarnaud-lb
committed
Change this_ptr to getThis()
1 parent 490439c commit bd3231a

File tree

12 files changed

+70
-70
lines changed

12 files changed

+70
-70
lines changed

‎conf.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ PHP_METHOD(RdKafka__Conf, __construct)
221221
return;
222222
}
223223

224-
intern = (kafka_conf_object*)zend_object_store_get_object(this_ptr TSRMLS_CC);
224+
intern = (kafka_conf_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
225225
intern->type = KAFKA_CONF;
226226
intern->u.conf = rd_kafka_conf_new();
227227

@@ -246,7 +246,7 @@ PHP_METHOD(RdKafka__Conf, dump)
246246
return;
247247
}
248248

249-
intern = get_kafka_conf_object(this_ptr TSRMLS_CC);
249+
intern = get_kafka_conf_object(getThis() TSRMLS_CC);
250250
if (!intern) {
251251
return;
252252
}
@@ -296,7 +296,7 @@ PHP_METHOD(RdKafka__Conf, set)
296296
return;
297297
}
298298

299-
intern = get_kafka_conf_object(this_ptr TSRMLS_CC);
299+
intern = get_kafka_conf_object(getThis() TSRMLS_CC);
300300
if (!intern) {
301301
return;
302302
}
@@ -343,7 +343,7 @@ PHP_METHOD(RdKafka__Conf, setDefaultTopicConf)
343343
return;
344344
}
345345

346-
intern = get_kafka_conf_object(this_ptr TSRMLS_CC);
346+
intern = get_kafka_conf_object(getThis() TSRMLS_CC);
347347
if (!intern) {
348348
return;
349349
}
@@ -377,7 +377,7 @@ PHP_METHOD(RdKafka__Conf, setErrorCb)
377377
return;
378378
}
379379

380-
intern = get_kafka_conf_object(this_ptr TSRMLS_CC);
380+
intern = get_kafka_conf_object(getThis() TSRMLS_CC);
381381
if (!intern) {
382382
return;
383383
}
@@ -413,7 +413,7 @@ PHP_METHOD(RdKafka__Conf, setRebalanceCb)
413413
return;
414414
}
415415

416-
intern = get_kafka_conf_object(this_ptr TSRMLS_CC);
416+
intern = get_kafka_conf_object(getThis() TSRMLS_CC);
417417
if (!intern) {
418418
return;
419419
}
@@ -445,7 +445,7 @@ PHP_METHOD(RdKafka__TopicConf, __construct)
445445
return;
446446
}
447447

448-
intern = (kafka_conf_object*)zend_object_store_get_object(this_ptr TSRMLS_CC);
448+
intern = (kafka_conf_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
449449
intern->type = KAFKA_TOPIC_CONF;
450450
intern->u.topic_conf = rd_kafka_topic_conf_new();
451451

@@ -469,7 +469,7 @@ PHP_METHOD(RdKafka__TopicConf, setPartitioner)
469469
return;
470470
}
471471

472-
intern = get_kafka_conf_object(this_ptr TSRMLS_CC);
472+
intern = get_kafka_conf_object(getThis() TSRMLS_CC);
473473
if (!intern) {
474474
return;
475475
}

‎kafka_consumer.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -123,13 +123,13 @@ PHP_METHOD(RdKafka__KafkaConsumer, __construct)
123123
return;
124124
}
125125

126-
intern = (object_intern*)zend_object_store_get_object(this_ptr TSRMLS_CC);
126+
intern = (object_intern*)zend_object_store_get_object(getThis() TSRMLS_CC);
127127

128128
conf_intern = get_kafka_conf_object(zconf TSRMLS_CC);
129129
if (conf_intern) {
130130
conf = rd_kafka_conf_dup(conf_intern->u.conf);
131131
kafka_conf_callbacks_copy(&intern->cbs, &conf_intern->cbs TSRMLS_CC);
132-
intern->cbs.rk = *this_ptr;
132+
intern->cbs.rk = *getThis();
133133
rd_kafka_conf_set_opaque(conf, &intern->cbs);
134134
}
135135

@@ -171,7 +171,7 @@ PHP_METHOD(RdKafka__KafkaConsumer, __destruct)
171171
return;
172172
}
173173

174-
intern = (object_intern*)zend_object_store_get_object(this_ptr TSRMLS_CC);
174+
intern = (object_intern*)zend_object_store_get_object(getThis() TSRMLS_CC);
175175

176176
if (intern->rk) {
177177
err = rd_kafka_consumer_close(intern->rk);
@@ -552,7 +552,7 @@ PHP_METHOD(RdKafka__KafkaConsumer, getMetadata)
552552
return;
553553
}
554554

555-
intern = get_object(this_ptr TSRMLS_CC);
555+
intern = get_object(getThis() TSRMLS_CC);
556556
if (!intern) {
557557
return;
558558
}
@@ -598,7 +598,7 @@ PHP_METHOD(RdKafka__KafkaConsumer, newTopic)
598598
return;
599599
}
600600

601-
intern = get_object(this_ptr TSRMLS_CC);
601+
intern = get_object(getThis() TSRMLS_CC);
602602
if (!intern) {
603603
return;
604604
}
@@ -626,8 +626,8 @@ PHP_METHOD(RdKafka__KafkaConsumer, newTopic)
626626
}
627627

628628
topic_intern->rkt = rkt;
629-
topic_intern->zrk = this_ptr;
630-
Z_ADDREF_P(this_ptr);
629+
topic_intern->zrk = getThis();
630+
Z_ADDREF_P(getThis());
631631
}
632632
/* }}} */
633633

‎message.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@ PHP_METHOD(RdKafka__Message, errstr)
6666
return;
6767
}
6868

69-
zerr = zend_read_property(NULL, this_ptr, ZEND_STRL("err"), 0 TSRMLS_CC);
69+
zerr = zend_read_property(NULL, getThis(), ZEND_STRL("err"), 0 TSRMLS_CC);
7070

7171
if (!zerr || Z_TYPE_P(zerr) != IS_LONG) {
7272
return;
7373
}
7474

75-
zpayload = zend_read_property(NULL, this_ptr, ZEND_STRL("payload"), 0 TSRMLS_CC);
75+
zpayload = zend_read_property(NULL, getThis(), ZEND_STRL("payload"), 0 TSRMLS_CC);
7676

7777
if (zpayload && Z_TYPE_P(zpayload) == IS_STRING) {
7878
RETURN_ZVAL(zpayload, 1, 0);

‎metadata.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ PHP_METHOD(RdKafka__Metadata, getOrigBrokerId)
136136
return;
137137
}
138138

139-
intern = get_object(this_ptr TSRMLS_CC);
139+
intern = get_object(getThis() TSRMLS_CC);
140140
if (!intern) {
141141
return;
142142
}
@@ -159,7 +159,7 @@ PHP_METHOD(RdKafka__Metadata, getOrigBrokerName)
159159
return;
160160
}
161161

162-
intern = get_object(this_ptr TSRMLS_CC);
162+
intern = get_object(getThis() TSRMLS_CC);
163163
if (!intern) {
164164
return;
165165
}
@@ -182,12 +182,12 @@ PHP_METHOD(RdKafka__Metadata, getBrokers)
182182
return;
183183
}
184184

185-
intern = get_object(this_ptr TSRMLS_CC);
185+
intern = get_object(getThis() TSRMLS_CC);
186186
if (!intern) {
187187
return;
188188
}
189189

190-
brokers_collection(return_value, this_ptr, intern TSRMLS_CC);
190+
brokers_collection(return_value, getThis(), intern TSRMLS_CC);
191191
}
192192
/* }}} */
193193

@@ -205,12 +205,12 @@ PHP_METHOD(RdKafka__Metadata, getTopics)
205205
return;
206206
}
207207

208-
intern = get_object(this_ptr TSRMLS_CC);
208+
intern = get_object(getThis() TSRMLS_CC);
209209
if (!intern) {
210210
return;
211211
}
212212

213-
topics_collection(return_value, this_ptr, intern TSRMLS_CC);
213+
topics_collection(return_value, getThis(), intern TSRMLS_CC);
214214
}
215215
/* }}} */
216216

‎metadata_broker.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ PHP_METHOD(RdKafka__Metadata__Broker, getId)
116116
return;
117117
}
118118

119-
intern = get_object(this_ptr TSRMLS_CC);
119+
intern = get_object(getThis() TSRMLS_CC);
120120
if (!intern) {
121121
return;
122122
}
@@ -139,7 +139,7 @@ PHP_METHOD(RdKafka__Metadata__Broker, getHost)
139139
return;
140140
}
141141

142-
intern = get_object(this_ptr TSRMLS_CC);
142+
intern = get_object(getThis() TSRMLS_CC);
143143
if (!intern) {
144144
return;
145145
}
@@ -162,7 +162,7 @@ PHP_METHOD(RdKafka__Metadata__Broker, getPort)
162162
return;
163163
}
164164

165-
intern = get_object(this_ptr TSRMLS_CC);
165+
intern = get_object(getThis() TSRMLS_CC);
166166
if (!intern) {
167167
return;
168168
}

‎metadata_collection.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ PHP_METHOD(RdKafka__Metadata__Collection, count)
125125
return;
126126
}
127127

128-
intern = get_object(this_ptr TSRMLS_CC);
128+
intern = get_object(getThis() TSRMLS_CC);
129129
if (!intern) {
130130
return;
131131
}
@@ -148,7 +148,7 @@ PHP_METHOD(RdKafka__Metadata__Collection, rewind)
148148
return;
149149
}
150150

151-
intern = get_object(this_ptr TSRMLS_CC);
151+
intern = get_object(getThis() TSRMLS_CC);
152152
if (!intern) {
153153
return;
154154
}
@@ -171,7 +171,7 @@ PHP_METHOD(RdKafka__Metadata__Collection, current)
171171
return;
172172
}
173173

174-
intern = get_object(this_ptr TSRMLS_CC);
174+
intern = get_object(getThis() TSRMLS_CC);
175175
if (!intern) {
176176
return;
177177
}
@@ -199,7 +199,7 @@ PHP_METHOD(RdKafka__Metadata__Collection, key)
199199
return;
200200
}
201201

202-
intern = get_object(this_ptr TSRMLS_CC);
202+
intern = get_object(getThis() TSRMLS_CC);
203203
if (!intern) {
204204
return;
205205
}
@@ -227,7 +227,7 @@ PHP_METHOD(RdKafka__Metadata__Collection, next)
227227
return;
228228
}
229229

230-
intern = get_object(this_ptr TSRMLS_CC);
230+
intern = get_object(getThis() TSRMLS_CC);
231231
if (!intern) {
232232
return;
233233
}
@@ -250,7 +250,7 @@ PHP_METHOD(RdKafka__Metadata__Collection, valid)
250250
return;
251251
}
252252

253-
intern = get_object(this_ptr TSRMLS_CC);
253+
intern = get_object(getThis() TSRMLS_CC);
254254
if (!intern) {
255255
return;
256256
}

‎metadata_partition.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ PHP_METHOD(RdKafka__Metadata__Partition, getId)
119119
return;
120120
}
121121

122-
intern = get_object(this_ptr TSRMLS_CC);
122+
intern = get_object(getThis() TSRMLS_CC);
123123
if (!intern) {
124124
return;
125125
}
@@ -142,7 +142,7 @@ PHP_METHOD(RdKafka__Metadata__Partition, getErr)
142142
return;
143143
}
144144

145-
intern = get_object(this_ptr TSRMLS_CC);
145+
intern = get_object(getThis() TSRMLS_CC);
146146
if (!intern) {
147147
return;
148148
}
@@ -165,7 +165,7 @@ PHP_METHOD(RdKafka__Metadata__Partition, getLeader)
165165
return;
166166
}
167167

168-
intern = get_object(this_ptr TSRMLS_CC);
168+
intern = get_object(getThis() TSRMLS_CC);
169169
if (!intern) {
170170
return;
171171
}
@@ -192,12 +192,12 @@ PHP_METHOD(RdKafka__Metadata__Partition, getReplicas)
192192
return;
193193
}
194194

195-
intern = get_object(this_ptr TSRMLS_CC);
195+
intern = get_object(getThis() TSRMLS_CC);
196196
if (!intern) {
197197
return;
198198
}
199199

200-
kafka_metadata_collection_init(return_value, this_ptr, intern->metadata_partition->replicas, intern->metadata_partition->replica_cnt, sizeof(*intern->metadata_partition->replicas), int32_ctor TSRMLS_CC);
200+
kafka_metadata_collection_init(return_value, getThis(), intern->metadata_partition->replicas, intern->metadata_partition->replica_cnt, sizeof(*intern->metadata_partition->replicas), int32_ctor TSRMLS_CC);
201201
}
202202
/* }}} */
203203

@@ -215,12 +215,12 @@ PHP_METHOD(RdKafka__Metadata__Partition, getIsrs)
215215
return;
216216
}
217217

218-
intern = get_object(this_ptr TSRMLS_CC);
218+
intern = get_object(getThis() TSRMLS_CC);
219219
if (!intern) {
220220
return;
221221
}
222222

223-
kafka_metadata_collection_init(return_value, this_ptr, intern->metadata_partition->isrs, intern->metadata_partition->isr_cnt, sizeof(*intern->metadata_partition->isrs), int32_ctor TSRMLS_CC);
223+
kafka_metadata_collection_init(return_value, getThis(), intern->metadata_partition->isrs, intern->metadata_partition->isr_cnt, sizeof(*intern->metadata_partition->isrs), int32_ctor TSRMLS_CC);
224224
}
225225
/* }}} */
226226

‎metadata_topic.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ PHP_METHOD(RdKafka__Metadata__Topic, getTopic)
128128
return;
129129
}
130130

131-
intern = get_object(this_ptr TSRMLS_CC);
131+
intern = get_object(getThis() TSRMLS_CC);
132132
if (!intern) {
133133
return;
134134
}
@@ -151,7 +151,7 @@ PHP_METHOD(RdKafka__Metadata__Topic, getErr)
151151
return;
152152
}
153153

154-
intern = get_object(this_ptr TSRMLS_CC);
154+
intern = get_object(getThis() TSRMLS_CC);
155155
if (!intern) {
156156
return;
157157
}
@@ -175,12 +175,12 @@ PHP_METHOD(RdKafka__Metadata__Topic, getPartitions)
175175
return;
176176
}
177177

178-
intern = get_object(this_ptr TSRMLS_CC);
178+
intern = get_object(getThis() TSRMLS_CC);
179179
if (!intern) {
180180
return;
181181
}
182182

183-
partitions_collection(return_value, this_ptr, intern TSRMLS_CC);
183+
partitions_collection(return_value, getThis(), intern TSRMLS_CC);
184184
}
185185
/* }}} */
186186

‎queue.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ PHP_METHOD(RdKafka__Queue, consume)
9292
return;
9393
}
9494

95-
intern = get_kafka_queue_object(this_ptr TSRMLS_CC);
95+
intern = get_kafka_queue_object(getThis() TSRMLS_CC);
9696
if (!intern) {
9797
return;
9898
}

0 commit comments

Comments
 (0)