Skip to content

Commit bba7362

Browse files
felipenspfelipensp
committed
- Fix compiler warning
1 parent 9760491 commit bba7362

File tree

2 files changed

+52
-52
lines changed

2 files changed

+52
-52
lines changed

‎phpdbg_cmd.c

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -146,28 +146,28 @@ PHPDBG_API char* phpdbg_param_tostring(const phpdbg_param_t *param, char **point
146146
{
147147
switch (param->type) {
148148
case STR_PARAM:
149-
asprintf(pointer,
149+
asprintf(pointer,
150150
"%s", param->str);
151151
break;
152-
152+
153153
case ADDR_PARAM:
154-
asprintf(pointer,
154+
asprintf(pointer,
155155
"%#lx", param->addr);
156156
break;
157-
157+
158158
case NUMERIC_PARAM:
159-
asprintf(pointer,
159+
asprintf(pointer,
160160
"%li",
161161
param->num);
162162
break;
163-
163+
164164
case METHOD_PARAM:
165165
asprintf(pointer,
166166
"%s::%s",
167167
param->method.class,
168168
param->method.name);
169169
break;
170-
170+
171171
case FILE_PARAM:
172172
if (param->num) {
173173
asprintf(pointer,
@@ -182,25 +182,25 @@ PHPDBG_API char* phpdbg_param_tostring(const phpdbg_param_t *param, char **point
182182
param->file.line);
183183
}
184184
break;
185-
185+
186186
case NUMERIC_FUNCTION_PARAM:
187-
asprintf(pointer,
188-
"%s#%lu", param->str, param->num);
187+
asprintf(pointer,
188+
"%s#%lu", param->str, param->num);
189189
break;
190-
190+
191191
case NUMERIC_METHOD_PARAM:
192192
asprintf(pointer,
193193
"%s::%s#%lu",
194194
param->method.class,
195195
param->method.name,
196196
param->num);
197197
break;
198-
198+
199199
default:
200-
asprintf(pointer,
200+
asprintf(pointer,
201201
"%s", "unknown");
202202
}
203-
203+
204204
return *pointer;
205205
} /* }}} */
206206

@@ -211,87 +211,87 @@ PHPDBG_API void phpdbg_copy_param(const phpdbg_param_t* src, phpdbg_param_t* des
211211
dest->str = estrndup(src->str, src->len);
212212
dest->len = src->len;
213213
break;
214-
214+
215215
case ADDR_PARAM:
216216
dest->addr = src->addr;
217217
break;
218-
218+
219219
case NUMERIC_PARAM:
220220
dest->num = src->num;
221221
break;
222-
222+
223223
case METHOD_PARAM:
224224
dest->method.class = estrdup(src->method.class);
225225
dest->method.name = estrdup(src->method.name);
226226
break;
227-
227+
228228
case FILE_PARAM:
229229
dest->file.name = estrdup(src->file.name);
230230
dest->file.line = src->file.line;
231231
if (src->num)
232232
dest->num = src->num;
233233
break;
234-
234+
235235
case NUMERIC_FUNCTION_PARAM:
236236
dest->str = estrndup(src->str, src->len);
237237
dest->num = src->num;
238238
dest->len = src->len;
239239
break;
240-
240+
241241
case NUMERIC_METHOD_PARAM:
242242
dest->method.class = estrdup(src->method.class);
243243
dest->method.name = estrdup(src->method.name);
244244
dest->num = src->num;
245245
break;
246-
246+
247247
case EMPTY_PARAM: { /* do nothing */ } break;
248248
}
249249
} /* }}} */
250250

251251
PHPDBG_API zend_ulong phpdbg_hash_param(const phpdbg_param_t *param TSRMLS_DC) /* {{{ */
252252
{
253253
zend_ulong hash = param->type;
254-
254+
255255
switch (param->type) {
256256
case STR_PARAM:
257257
hash += zend_inline_hash_func(param->str, param->len);
258258
break;
259-
259+
260260
case METHOD_PARAM:
261261
hash += zend_inline_hash_func(param->method.class, strlen(param->method.class));
262262
hash += zend_inline_hash_func(param->method.name, strlen(param->method.name));
263263
break;
264-
264+
265265
case FILE_PARAM:
266266
hash += zend_inline_hash_func(param->file.name, strlen(param->file.name));
267267
hash += param->file.line;
268268
if (param->num)
269269
hash += param->num;
270270
break;
271-
271+
272272
case ADDR_PARAM:
273273
hash += param->addr;
274274
break;
275-
275+
276276
case NUMERIC_PARAM:
277277
hash += param->num;
278278
break;
279-
279+
280280
case NUMERIC_FUNCTION_PARAM:
281281
hash += zend_inline_hash_func(param->str, param->len);
282282
hash += param->num;
283283
break;
284-
284+
285285
case NUMERIC_METHOD_PARAM:
286286
hash += zend_inline_hash_func(param->method.class, strlen(param->method.class));
287287
hash += zend_inline_hash_func(param->method.name, strlen(param->method.name));
288288
if (param->num)
289289
hash+= param->num;
290290
break;
291-
291+
292292
case EMPTY_PARAM: { /* do nothing */ } break;
293293
}
294-
294+
295295
return hash;
296296
} /* }}} */
297297

@@ -300,59 +300,59 @@ PHPDBG_API zend_bool phpdbg_match_param(const phpdbg_param_t *l, const phpdbg_pa
300300
if (l && r) {
301301
if (l->type == r->type) {
302302
switch (l->type) {
303-
303+
304304
case NUMERIC_FUNCTION_PARAM:
305305
if (l->num != r->num) {
306306
break;
307307
}
308308
/* break intentionally omitted */
309-
309+
310310
case STR_PARAM:
311-
return (l->len == r->len) &&
311+
return (l->len == r->len) &&
312312
(memcmp(l->str, r->str, l->len) == SUCCESS);
313-
313+
314314
case NUMERIC_PARAM:
315315
return (l->num == r->num);
316-
316+
317317
case ADDR_PARAM:
318318
return (l->addr == r->addr);
319-
319+
320320
case FILE_PARAM: {
321321
if (l->file.line == r->file.line) {
322322
size_t lengths[2] = {
323323
strlen(l->file.name), strlen(r->file.name)};
324-
324+
325325
if (lengths[0] == lengths[1]) {
326326
if ((!l->num && !r->num) || (l->num == r->num)) {
327327
return (memcmp(
328328
l->file.name, r->file.name, lengths[0]) == SUCCESS);
329329
}
330330
}
331331
}
332-
} break;
333-
332+
} break;
333+
334334
case NUMERIC_METHOD_PARAM:
335335
if (l->num != r->num) {
336336
break;
337337
}
338338
/* break intentionally omitted */
339-
339+
340340
case METHOD_PARAM: {
341341
size_t lengths[2] = {
342342
strlen(l->method.class), strlen(r->method.class)};
343343
if (lengths[0] == lengths[1]) {
344344
if (memcmp(l->method.class, r->method.class, lengths[0]) == SUCCESS) {
345345
lengths[0] = strlen(l->method.name);
346346
lengths[1] = strlen(r->method.name);
347-
347+
348348
if (lengths[0] == lengths[1]) {
349349
return (memcmp(
350350
l->method.name, r->method.name, lengths[0]) == SUCCESS);
351351
}
352352
}
353353
}
354354
} break;
355-
355+
356356
case EMPTY_PARAM:
357357
return 1;
358358
}
@@ -435,7 +435,7 @@ PHPDBG_API phpdbg_input_t **phpdbg_read_argv(char *buffer, int *argc TSRMLS_DC)
435435

436436
case IN_STRING:
437437
phpdbg_error(
438-
"Malformed command line (unclosed quote) @ %ld: %s!",
438+
"Malformed command line (unclosed quote) @ %d: %s!",
439439
(p - buffer)-1, &buffer[(p - buffer)-1]);
440440
break;
441441

@@ -461,11 +461,11 @@ PHPDBG_API phpdbg_input_t *phpdbg_read_input(char *buffered TSRMLS_DC) /* {{{ */
461461

462462
if (!(PHPDBG_G(flags) & PHPDBG_IS_QUITTING)) {
463463
if ((PHPDBG_G(flags) & PHPDBG_IS_REMOTE) &&
464-
(buffered == NULL)) {
464+
(buffered == NULL)) {
465465
fflush(PHPDBG_G(io)[PHPDBG_STDOUT]);
466466
}
467-
468-
if (buffered == NULL) {
467+
468+
if (buffered == NULL) {
469469
#ifndef HAVE_LIBREADLINE
470470
char buf[PHPDBG_MAX_CMD];
471471
if ((!(PHPDBG_G(flags) & PHPDBG_IS_REMOTE) && !phpdbg_write(phpdbg_get_prompt(TSRMLS_C))) ||
@@ -476,7 +476,7 @@ PHPDBG_API phpdbg_input_t *phpdbg_read_input(char *buffered TSRMLS_DC) /* {{{ */
476476
zend_bailout();
477477
return NULL;
478478
}
479-
479+
480480
cmd = buf;
481481
#else
482482
if ((PHPDBG_G(flags) & PHPDBG_IS_REMOTE)) {
@@ -485,7 +485,7 @@ PHPDBG_API phpdbg_input_t *phpdbg_read_input(char *buffered TSRMLS_DC) /* {{{ */
485485
cmd = buf;
486486
} else cmd = NULL;
487487
} else cmd = readline(phpdbg_get_prompt(TSRMLS_C));
488-
488+
489489
if (!cmd) {
490490
/* the user has gone away */
491491
phpdbg_error("Failed to read console !");
@@ -527,7 +527,7 @@ PHPDBG_API phpdbg_input_t *phpdbg_read_input(char *buffered TSRMLS_DC) /* {{{ */
527527
#endif
528528

529529
#ifdef HAVE_LIBREADLINE
530-
if (!buffered && cmd &&
530+
if (!buffered && cmd &&
531531
!(PHPDBG_G(flags) & PHPDBG_IS_REMOTE)) {
532532
free(cmd);
533533
}
@@ -551,7 +551,7 @@ PHPDBG_API void phpdbg_destroy_argv(phpdbg_input_t **argv, int argc TSRMLS_DC) /
551551
}
552552
efree(argv);
553553
}
554-
554+
555555
} /* }}} */
556556

557557
PHPDBG_API void phpdbg_destroy_input(phpdbg_input_t **input TSRMLS_DC) /*{{{ */

‎phpdbg_opcode.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ char *phpdbg_decode_opline(zend_op_array *ops, zend_op *op, HashTable *vars TSRM
8484
#ifdef ZEND_FAST_CALL
8585
case ZEND_FAST_CALL:
8686
#endif
87-
asprintf(&decode[1], "J%lu", op->op1.jmp_addr - ops->opcodes);
87+
asprintf(&decode[1], "J%d", op->op1.jmp_addr - ops->opcodes);
8888
goto format;
8989

9090
case ZEND_JMPZNZ:
@@ -106,7 +106,7 @@ char *phpdbg_decode_opline(zend_op_array *ops, zend_op *op, HashTable *vars TSRM
106106
#endif
107107
decode[1] = phpdbg_decode_op(ops, &op->op1, op->op1_type, vars TSRMLS_CC);
108108
asprintf(
109-
&decode[2], "J%lu", op->op2.jmp_addr - ops->opcodes);
109+
&decode[2], "J%d", op->op2.jmp_addr - ops->opcodes);
110110
goto result;
111111

112112
case ZEND_RECV_INIT:

0 commit comments

Comments
 (0)