|
 |
3cc260 |
diff -up rrdtool-1.4.4/php4/rrdtool.c.php54 rrdtool-1.4.4/php4/rrdtool.c
|
|
|
3cc260 |
--- rrdtool-1.4.4/php4/rrdtool.c.php54 2011-12-29 08:57:00.790784347 +0100
|
|
|
3cc260 |
+++ rrdtool-1.4.4/php4/rrdtool.c 2011-12-29 09:00:55.960794927 +0100
|
|
|
3cc260 |
@@ -39,7 +39,7 @@
|
|
|
3cc260 |
ZEND_DECLARE_MODULE_GLOBALS(rrdtool)
|
|
|
3cc260 |
*/
|
|
|
3cc260 |
|
|
|
3cc260 |
-function_entry rrdtool_functions[] = {
|
|
|
3cc260 |
+zend_function_entry rrdtool_functions[] = {
|
|
|
3cc260 |
PHP_FE(rrd_graph, NULL)
|
|
|
3cc260 |
PHP_FE(rrd_fetch, NULL)
|
|
|
3cc260 |
PHP_FE(rrd_error, NULL)
|
|
|
3cc260 |
@@ -119,8 +119,8 @@ PHP_MINFO_FUNCTION(rrdtool)
|
|
|
3cc260 |
Creates a graph based on options passed via an array */
|
|
|
3cc260 |
PHP_FUNCTION(rrd_graph)
|
|
|
3cc260 |
{
|
|
|
3cc260 |
- pval *file, *args, *p_argc;
|
|
|
3cc260 |
- pval *entry;
|
|
|
3cc260 |
+ zval *file, *args, *p_argc;
|
|
|
3cc260 |
+ zval *entry;
|
|
|
3cc260 |
zval *p_calcpr;
|
|
|
3cc260 |
HashTable *args_arr;
|
|
|
3cc260 |
int i, xsize, ysize, argc;
|
|
|
3cc260 |
@@ -155,7 +155,7 @@ PHP_FUNCTION(rrd_graph)
|
|
|
3cc260 |
|
|
|
3cc260 |
for (i = 3; i < argc; i++)
|
|
|
3cc260 |
{
|
|
|
3cc260 |
- pval **dataptr;
|
|
|
3cc260 |
+ zval **dataptr;
|
|
|
3cc260 |
|
|
|
3cc260 |
if ( zend_hash_get_current_data(args_arr, (void *) &dataptr) == FAILURE )
|
|
|
3cc260 |
continue;
|
|
|
3cc260 |
@@ -216,9 +216,8 @@ PHP_FUNCTION(rrd_graph)
|
|
|
3cc260 |
Fetch info from an RRD file */
|
|
|
3cc260 |
PHP_FUNCTION(rrd_fetch)
|
|
|
3cc260 |
{
|
|
|
3cc260 |
- pval *file, *args, *p_argc;
|
|
|
3cc260 |
- pval *entry;
|
|
|
3cc260 |
- pval *p_start, *p_end, *p_step, *p_ds_cnt;
|
|
|
3cc260 |
+ zval *file, *args, *p_argc;
|
|
|
3cc260 |
+ zval *entry;
|
|
|
3cc260 |
HashTable *args_arr;
|
|
|
3cc260 |
zval *p_ds_namv, *p_data;
|
|
|
3cc260 |
int i, j, argc;
|
|
|
3cc260 |
@@ -254,7 +253,7 @@ PHP_FUNCTION(rrd_fetch)
|
|
|
3cc260 |
|
|
|
3cc260 |
for (i = 3; i < argc; i++)
|
|
|
3cc260 |
{
|
|
|
3cc260 |
- pval **dataptr;
|
|
|
3cc260 |
+ zval **dataptr;
|
|
|
3cc260 |
|
|
|
3cc260 |
if ( zend_hash_get_current_data(args_arr, (void *) &dataptr) == FAILURE )
|
|
|
3cc260 |
continue;
|
|
|
3cc260 |
@@ -361,7 +360,7 @@ PHP_FUNCTION(rrd_clear_error)
|
|
|
3cc260 |
Update an RRD file with values specified */
|
|
|
3cc260 |
PHP_FUNCTION(rrd_update)
|
|
|
3cc260 |
{
|
|
|
3cc260 |
- pval *file, *opt;
|
|
|
3cc260 |
+ zval *file, *opt;
|
|
|
3cc260 |
char **argv;
|
|
|
3cc260 |
|
|
|
3cc260 |
if ( rrd_test_error() )
|
|
|
3cc260 |
@@ -404,7 +403,7 @@ PHP_FUNCTION(rrd_update)
|
|
|
3cc260 |
Gets last update time of an RRD file */
|
|
|
3cc260 |
PHP_FUNCTION(rrd_last)
|
|
|
3cc260 |
{
|
|
|
3cc260 |
- pval *file;
|
|
|
3cc260 |
+ zval *file;
|
|
|
3cc260 |
unsigned long retval;
|
|
|
3cc260 |
|
|
|
3cc260 |
char **argv = (char **) emalloc(3 * sizeof(char *));
|
|
|
3cc260 |
@@ -439,8 +438,8 @@ PHP_FUNCTION(rrd_last)
|
|
|
3cc260 |
Create an RRD file with the options passed (passed via array) */
|
|
|
3cc260 |
PHP_FUNCTION(rrd_create)
|
|
|
3cc260 |
{
|
|
|
3cc260 |
- pval *file, *args, *p_argc;
|
|
|
3cc260 |
- pval *entry;
|
|
|
3cc260 |
+ zval *file, *args, *p_argc;
|
|
|
3cc260 |
+ zval *entry;
|
|
|
3cc260 |
char **argv;
|
|
|
3cc260 |
HashTable *args_arr;
|
|
|
3cc260 |
int argc, i;
|
|
|
3cc260 |
@@ -449,7 +448,7 @@ PHP_FUNCTION(rrd_create)
|
|
|
3cc260 |
rrd_clear_error();
|
|
|
3cc260 |
|
|
|
3cc260 |
if ( ZEND_NUM_ARGS() == 3 &&
|
|
|
3cc260 |
- getParameters(ht, 3, &file, &args, &p_argc) == SUCCESS )
|
|
|
3cc260 |
+ zend_get_parameters(ht, 3, &file, &args, &p_argc) == SUCCESS )
|
|
|
3cc260 |
{
|
|
|
3cc260 |
if ( args->type != IS_ARRAY )
|
|
|
3cc260 |
{
|
|
|
3cc260 |
@@ -473,7 +472,7 @@ PHP_FUNCTION(rrd_create)
|
|
|
3cc260 |
|
|
|
3cc260 |
for (i = 3; i < argc; i++)
|
|
|
3cc260 |
{
|
|
|
3cc260 |
- pval **dataptr;
|
|
|
3cc260 |
+ zval **dataptr;
|
|
|
3cc260 |
|
|
|
3cc260 |
if ( zend_hash_get_current_data(args_arr, (void *) &dataptr) == FAILURE )
|
|
|
3cc260 |
continue;
|