Skip to content

Commit 969e659

Browse files
krakjoekrakjoe
committed
Merge branch 'master' of https://github.com/krakjoe/phpdbg 
2 parents 6d95449 + 6ba7333 commit 969e659

20 files changed

+946
-951
lines changed

‎phpdbg.c‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,14 @@ static PHP_MINIT_FUNCTION(phpdbg) /* {{{ */
7070
zend_execute = phpdbg_execute_ex;
7171
#endif
7272

73-
REGISTER_LONG_CONSTANT("PHPDBG_FILE", FILE_PARAM, CONST_CS|CONST_PERSISTENT);
74-
REGISTER_LONG_CONSTANT("PHPDBG_METHOD", METHOD_PARAM, CONST_CS|CONST_PERSISTENT);
73+
REGISTER_LONG_CONSTANT("PHPDBG_FILE", FILE_PARAM, CONST_CS|CONST_PERSISTENT);
74+
REGISTER_LONG_CONSTANT("PHPDBG_METHOD", METHOD_PARAM, CONST_CS|CONST_PERSISTENT);
7575
REGISTER_LONG_CONSTANT("PHPDBG_LINENO", NUMERIC_PARAM, CONST_CS|CONST_PERSISTENT);
76-
REGISTER_LONG_CONSTANT("PHPDBG_FUNC", STR_PARAM, CONST_CS|CONST_PERSISTENT);
76+
REGISTER_LONG_CONSTANT("PHPDBG_FUNC", STR_PARAM, CONST_CS|CONST_PERSISTENT);
7777

7878
REGISTER_LONG_CONSTANT("PHPDBG_COLOR_PROMPT", PHPDBG_COLOR_PROMPT, CONST_CS|CONST_PERSISTENT);
7979
REGISTER_LONG_CONSTANT("PHPDBG_COLOR_NOTICE", PHPDBG_COLOR_NOTICE, CONST_CS|CONST_PERSISTENT);
80-
REGISTER_LONG_CONSTANT("PHPDBG_COLOR_ERROR", PHPDBG_COLOR_ERROR, CONST_CS|CONST_PERSISTENT);
80+
REGISTER_LONG_CONSTANT("PHPDBG_COLOR_ERROR", PHPDBG_COLOR_ERROR, CONST_CS|CONST_PERSISTENT);
8181

8282
return SUCCESS;
8383
} /* }}} */
@@ -427,33 +427,33 @@ static inline void php_sapi_phpdbg_flush(void *context) /* {{{ */
427427
/* {{{ sapi_module_struct phpdbg_sapi_module
428428
*/
429429
static sapi_module_struct phpdbg_sapi_module = {
430-
"phpdbg", /* name */
431-
"phpdbg", /* pretty name */
430+
"phpdbg", /* name */
431+
"phpdbg", /* pretty name */
432432

433-
php_sapi_phpdbg_module_startup, /* startup */
433+
php_sapi_phpdbg_module_startup, /* startup */
434434
php_module_shutdown_wrapper, /* shutdown */
435435

436-
NULL, /* activate */
437-
php_sapi_phpdbg_deactivate, /* deactivate */
436+
NULL, /* activate */
437+
php_sapi_phpdbg_deactivate, /* deactivate */
438438

439-
php_sapi_phpdbg_ub_write, /* unbuffered write */
440-
php_sapi_phpdbg_flush, /* flush */
441-
NULL, /* get uid */
442-
NULL, /* getenv */
439+
php_sapi_phpdbg_ub_write, /* unbuffered write */
440+
php_sapi_phpdbg_flush, /* flush */
441+
NULL, /* get uid */
442+
NULL, /* getenv */
443443

444-
php_error, /* error handler */
444+
php_error, /* error handler */
445445

446-
php_sapi_phpdbg_header_handler, /* header handler */
447-
php_sapi_phpdbg_send_headers, /* send headers handler */
448-
php_sapi_phpdbg_send_header, /* send header handler */
446+
php_sapi_phpdbg_header_handler, /* header handler */
447+
php_sapi_phpdbg_send_headers, /* send headers handler */
448+
php_sapi_phpdbg_send_header, /* send header handler */
449449

450-
NULL, /* read POST data */
450+
NULL, /* read POST data */
451451
php_sapi_phpdbg_read_cookies, /* read Cookies */
452452

453-
php_sapi_phpdbg_register_vars, /* register server variables */
454-
php_sapi_phpdbg_log_message, /* Log message */
455-
NULL, /* Get request time */
456-
NULL, /* Child terminate */
453+
php_sapi_phpdbg_register_vars, /* register server variables */
454+
php_sapi_phpdbg_log_message, /* Log message */
455+
NULL, /* Get request time */
456+
NULL, /* Child terminate */
457457
STANDARD_SAPI_MODULE_PROPERTIES
458458
};
459459
/* }}} */
@@ -487,11 +487,11 @@ const char phpdbg_ini_hardcoded[] =
487487
"max_input_time=-1\n\0";
488488

489489
/* overwriteable ini defaults must be set in phpdbg_ini_defaults() */
490-
#define INI_DEFAULT(name,value)\
491-
Z_SET_REFCOUNT(tmp, 0);\
492-
Z_UNSET_ISREF(tmp); \
493-
ZVAL_STRINGL(&tmp, zend_strndup(value, sizeof(value)-1), sizeof(value)-1, 0);\
494-
zend_hash_update(configuration_hash, name, sizeof(name), &tmp, sizeof(zval), NULL);\
490+
#define INI_DEFAULT(name, value) \
491+
Z_SET_REFCOUNT(tmp, 0); \
492+
Z_UNSET_ISREF(tmp); \
493+
ZVAL_STRINGL(&tmp, zend_strndup(value, sizeof(value)-1), sizeof(value)-1, 0); \
494+
zend_hash_update(configuration_hash, name, sizeof(name), &tmp, sizeof(zval), NULL);
495495

496496
void phpdbg_ini_defaults(HashTable *configuration_hash) /* {{{ */
497497
{

‎phpdbg.h‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -106,22 +106,22 @@
106106
#define PHPDBG_IS_COLOURED (1<<12)
107107
#define PHPDBG_IS_CLEANING (1<<13)
108108

109-
#define PHPDBG_IN_UNTIL (1<<14)
110-
#define PHPDBG_IN_FINISH (1<<15)
111-
#define PHPDBG_IN_LEAVE (1<<16)
112-
#define PHPDBG_SEEK_MASK (PHPDBG_IN_UNTIL|PHPDBG_IN_FINISH|PHPDBG_IN_LEAVE)
113-
114-
#define PHPDBG_IS_REGISTERED (1<<17)
115-
#define PHPDBG_IS_STEPONEVAL (1<<18)
116-
#define PHPDBG_IS_INITIALIZING (1<<19)
109+
#define PHPDBG_IN_UNTIL (1<<14)
110+
#define PHPDBG_IN_FINISH (1<<15)
111+
#define PHPDBG_IN_LEAVE (1<<16)
112+
#define PHPDBG_SEEK_MASK (PHPDBG_IN_UNTIL|PHPDBG_IN_FINISH|PHPDBG_IN_LEAVE)
113+
114+
#define PHPDBG_IS_REGISTERED (1<<17)
115+
#define PHPDBG_IS_STEPONEVAL (1<<18)
116+
#define PHPDBG_IS_INITIALIZING (1<<19)
117117
#define PHPDBG_IS_SIGNALED (1<<20)
118-
#define PHPDBG_IS_INTERACTIVE (1<<21)
118+
#define PHPDBG_IS_INTERACTIVE (1<<21)
119119
#define PHPDBG_IS_BP_ENABLED (1<<22)
120120

121121
#ifndef _WIN32
122-
# define PHPDBG_DEFAULT_FLAGS (PHPDBG_IS_QUIET|PHPDBG_IS_COLOURED|PHPDBG_IS_BP_ENABLED)
122+
# define PHPDBG_DEFAULT_FLAGS (PHPDBG_IS_QUIET|PHPDBG_IS_COLOURED|PHPDBG_IS_BP_ENABLED)
123123
#else
124-
# define PHPDBG_DEFAULT_FLAGS (PHPDBG_IS_QUIET|PHPDBG_IS_BP_ENABLED)
124+
# define PHPDBG_DEFAULT_FLAGS (PHPDBG_IS_QUIET|PHPDBG_IS_BP_ENABLED)
125125
#endif /* }}} */
126126

127127
/* {{{ strings */
@@ -138,29 +138,29 @@
138138

139139
/* {{{ structs */
140140
ZEND_BEGIN_MODULE_GLOBALS(phpdbg)
141-
HashTable bp[PHPDBG_BREAK_TABLES]; /* break points */
142-
HashTable registered; /* registered */
143-
HashTable seek; /* seek oplines */
144-
phpdbg_frame_t frame; /* frame */
141+
HashTable bp[PHPDBG_BREAK_TABLES]; /* break points */
142+
HashTable registered; /* registered */
143+
HashTable seek; /* seek oplines */
144+
phpdbg_frame_t frame; /* frame */
145145

146-
char *exec; /* file to execute */
147-
size_t exec_len; /* size of exec */
148-
zend_op_array *ops; /* op_array */
149-
zval *retval; /* return value */
150-
int bp_count; /* breakpoint count */
151-
int del_bp_num; /* breakpoint to delete */
152-
int vmret; /* return from last opcode handler execution */
146+
char *exec; /* file to execute */
147+
size_t exec_len; /* size of exec */
148+
zend_op_array *ops; /* op_array */
149+
zval *retval; /* return value */
150+
int bp_count; /* breakpoint count */
151+
int del_bp_num; /* breakpoint to delete */
152+
int vmret; /* return from last opcode handler execution */
153153

154-
FILE *oplog; /* opline log */
155-
FILE *io[PHPDBG_IO_FDS]; /* io */
154+
FILE *oplog; /* opline log */
155+
FILE *io[PHPDBG_IO_FDS]; /* io */
156156

157-
char *prompt[2]; /* prompt */
158-
const phpdbg_color_t *colors[PHPDBG_COLORS]; /* colors */
157+
char *prompt[2]; /* prompt */
158+
const phpdbg_color_t *colors[PHPDBG_COLORS]; /* colors */
159159

160-
phpdbg_command_t *lcmd; /* last command */
161-
phpdbg_param_t lparam; /* last param */
160+
phpdbg_command_t *lcmd; /* last command */
161+
phpdbg_param_t lparam; /* last param */
162162

163-
zend_ulong flags; /* phpdbg flags */
163+
zend_ulong flags; /* phpdbg flags */
164164
ZEND_END_MODULE_GLOBALS(phpdbg) /* }}} */
165165

166166
#endif /* PHPDBG_H */

0 commit comments

Comments
 (0)