From: Felipe Pena Date: Sun, 24 Nov 2013 20:14:33 +0000 (-0200) Subject: - CS X-Git-Tag: php-5.6.0alpha1~110^2~78^2~1 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d21e7f5aa0c2dff09e4138128214122854e17d2c;p=php - CS --- diff --git a/phpdbg_utils.c b/phpdbg_utils.c index de3342b274..c234e64d80 100644 --- a/phpdbg_utils.c +++ b/phpdbg_utils.c @@ -228,7 +228,7 @@ PHPDBG_API int phpdbg_print(int type TSRMLS_DC, FILE *fp, const char *format, .. return rc; } /* }}} */ -PHPDBG_API const phpdbg_color_t* phpdbg_get_color(const char *name, size_t name_length TSRMLS_DC) /* {{{ */ +PHPDBG_API const phpdbg_color_t *phpdbg_get_color(const char *name, size_t name_length TSRMLS_DC) /* {{{ */ { const phpdbg_color_t *color = colors; @@ -256,6 +256,7 @@ PHPDBG_API void phpdbg_set_color(int element, const phpdbg_color_t *color TSRMLS PHPDBG_API void phpdbg_set_color_ex(int element, const char *name, size_t name_length TSRMLS_DC) /* {{{ */ { const phpdbg_color_t *color = phpdbg_get_color(name, name_length TSRMLS_CC); + if (color) { phpdbg_set_color(element, color TSRMLS_CC); } else PHPDBG_G(colors)[element] = colors; diff --git a/phpdbg_utils.h b/phpdbg_utils.h index 18b6a47141..399020f534 100644 --- a/phpdbg_utils.h +++ b/phpdbg_utils.h @@ -81,7 +81,7 @@ PHPDBG_API int phpdbg_print(int TSRMLS_DC, FILE*, const char*, ...) PHP_ATTRIBUT {color, sizeof(color)-1, code} #define PHPDBG_COLOR_END \ {NULL, 0L, {0}} - + #define PHPDBG_COLOR_INVALID -1 #define PHPDBG_COLOR_PROMPT 0 #define PHPDBG_COLOR_ERROR 1 @@ -94,7 +94,7 @@ typedef struct _phpdbg_color_t { const char code[PHPDBG_COLOR_LEN]; } phpdbg_color_t; -PHPDBG_API const phpdbg_color_t* phpdbg_get_color(const char *name, size_t name_length TSRMLS_DC); +PHPDBG_API const phpdbg_color_t *phpdbg_get_color(const char *name, size_t name_length TSRMLS_DC); PHPDBG_API void phpdbg_set_color(int element, const phpdbg_color_t *color TSRMLS_DC); PHPDBG_API void phpdbg_set_color_ex(int element, const char *name, size_t name_length TSRMLS_DC); /* }}} */