com php-src: - CS: phpdbg_utils.c phpdbg_utils.h

From: Date: Sun, 24 Nov 2013 20:14:33 +0000
Subject: com php-src: - CS: phpdbg_utils.c phpdbg_utils.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-74618@lists.php.net to get a copy of this message
Commit: d21e7f5aa0c2dff09e4138128214122854e17d2c Author: Felipe Pena <felipensp@gmail.com> Sun, 24 Nov 2013 18:14:33 -0200 Parents: 70cf09bf5bf4078511fd5879ed3d1f98624a2692 Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d21e7f5aa0c2dff09e4138128214122854e17d2c Log: - CS Changed paths: M phpdbg_utils.c M phpdbg_utils.h Diff: diff --git a/phpdbg_utils.c b/phpdbg_utils.c index de3342b..c234e64 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 18b6a47..399020f 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); /* }}} */

« previous php.cvs (#74618) next »