diff options
| author | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:37:48 -0400 |
|---|---|---|
| committer | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:37:48 -0400 |
| commit | eddbbea4325e602ddc87c545531609132d4f0e3b (patch) | |
| tree | f0994206a7e0a6251be7cc6729ba480f0c8729c2 /ext/json/json.c | |
| parent | 2d4e5b09576bb4f0ba716cc82cdf29ea04d9184b (diff) | |
| download | php-eddbbea4325e602ddc87c545531609132d4f0e3b.tar.gz | |
Imported Upstream version 5.2.3upstream/5.2.3
Diffstat (limited to 'ext/json/json.c')
| -rw-r--r-- | ext/json/json.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ext/json/json.c b/ext/json/json.c index c406522aa..c3dfbf8ab 100644 --- a/ext/json/json.c +++ b/ext/json/json.c @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: json.c,v 1.9.2.14 2007/04/13 21:34:12 andrei Exp $ */ +/* $Id: json.c,v 1.9.2.15 2007/05/25 13:24:50 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -387,6 +387,8 @@ static void json_encode_r(smart_str *buf, zval *val TSRMLS_DC) { return; } +/* {{{ proto string json_encode(mixed data) + Returns the JSON representation of a value */ static PHP_FUNCTION(json_encode) { zval *parameter; @@ -402,7 +404,10 @@ static PHP_FUNCTION(json_encode) smart_str_free(&buf); } +/* }}} */ +/* {{{ proto mixed json_decode(string json [, bool assoc]) + Decodes the JSON representation into a PHP value */ static PHP_FUNCTION(json_decode) { char *parameter; @@ -476,6 +481,7 @@ static PHP_FUNCTION(json_decode) } } } +/* }}} */ /* * Local variables: |