bjori Fri May 25 13:24:50 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/json json.c
Log:
MFH: protos (patch by jeffg at activestate dot com)
http://cvs.php.net/viewvc.cgi/php-src/ext/json/json.c?r1=1.9.2.14&r2=1.9.2.15&diff_format=u
Index: php-src/ext/json/json.c
diff -u php-src/ext/json/json.c:1.9.2.14 php-src/ext/json/json.c:1.9.2.15
--- php-src/ext/json/json.c:1.9.2.14 Fri Apr 13 21:34:12 2007
+++ php-src/ext/json/json.c Fri May 25 13:24:50 2007
@@ -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 @@
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 @@
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 @@
}
}
}
+/* }}} */
/*
* Local variables:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
