Skip to content

Commit 3867962

Browse files
committed
Merge branch 'master' of https://github.com/krakjoe/phpdbg
2 parents cad9fb8 + 4ad50af commit 3867962

File tree

3 files changed

+13
-14
lines changed

3 files changed

+13
-14
lines changed

phpdbg_cmd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ void phpdbg_clear_param(phpdbg_param_t *param TSRMLS_DC) /* {{{ */
118118

119119
} /* }}} */
120120

121-
phpdbg_input_t** phpdbg_read_argv(char *buffer, int *argc TSRMLS_DC) /* {{{ */
121+
phpdbg_input_t **phpdbg_read_argv(char *buffer, int *argc TSRMLS_DC) /* {{{ */
122122
{
123123
char *p;
124124
char b[PHPDBG_MAX_CMD];

phpdbg_cmd.h

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,11 @@ typedef enum {
4343
typedef struct _phpdbg_input_t phpdbg_input_t;
4444

4545
struct _phpdbg_input_t {
46-
char* const* start;
47-
char *string;
48-
size_t length;
49-
46+
char * const *start;
47+
char *string;
48+
size_t length;
5049
phpdbg_input_t **argv;
51-
int argc;
50+
int argc;
5251
};
5352

5453
typedef struct _phpdbg_param {
@@ -67,7 +66,7 @@ typedef struct _phpdbg_param {
6766
size_t len;
6867
} phpdbg_param_t;
6968

70-
typedef int (*phpdbg_command_handler_t)(phpdbg_param_t *param TSRMLS_DC);
69+
typedef int (*phpdbg_command_handler_t)(phpdbg_param_t* TSRMLS_DC);
7170

7271
struct _phpdbg_command_t {
7372
const char *name; /* Command name */

phpdbg_prompt.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ void phpdbg_init(char *init_file, size_t init_file_len, zend_bool use_default TS
153153
}
154154
goto next_line;
155155
}
156-
156+
157157
{
158158
phpdbg_input_t *input = phpdbg_read_input(cmd TSRMLS_CC);
159159
switch (phpdbg_do_cmd(phpdbg_prompt_commands, input TSRMLS_CC)) {
@@ -164,7 +164,7 @@ void phpdbg_init(char *init_file, size_t init_file_len, zend_bool use_default TS
164164
}
165165
phpdbg_destroy_input(&input TSRMLS_CC);
166166
}
167-
167+
168168
}
169169
next_line:
170170
line++;
@@ -920,10 +920,10 @@ static PHPDBG_COMMAND(list) /* {{{ */
920920
int phpdbg_call_register(phpdbg_input_t *input TSRMLS_DC) /* {{{ */
921921
{
922922
phpdbg_input_t *function = input->argv[0];
923-
923+
924924
if (zend_hash_exists(
925925
&PHPDBG_G(registered), function->string, function->length+1)) {
926-
926+
927927
zval fname, *fretval;
928928
zend_fcall_info *fci = emalloc(sizeof(zend_fcall_info));
929929

@@ -971,9 +971,9 @@ int phpdbg_call_register(phpdbg_input_t *input TSRMLS_DC) /* {{{ */
971971
fretval, 0 TSRMLS_CC);
972972
phpdbg_writeln(EMPTY);
973973
}
974-
974+
975975
zval_dtor(&fname);
976-
976+
977977
if (fci->params) {
978978
efree(fci->params);
979979
}
@@ -990,7 +990,7 @@ int phpdbg_interactive(TSRMLS_D) /* {{{ */
990990
{
991991
int ret = SUCCESS;
992992

993-
phpdbg_input_t* input = phpdbg_read_input(NULL TSRMLS_CC);
993+
phpdbg_input_t *input = phpdbg_read_input(NULL TSRMLS_CC);
994994

995995
if (input && input->length > 0L) {
996996
do {

0 commit comments

Comments
 (0)