cvs: /php4/ext/standard basic_functions.c

andrei Tue Nov 2 09:39:45 1999 EDT Modified files: /php4/ext/standard basic_functions.c Log: Remove extraneous comment. # Pay no attention to multisort() at the moment. Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.114 php4/ext/standard/basic_functions.c:1.115 --- php4/ext/standard/basic_functions.c:1.114 Mon Nov 1 22:47:09 1999 +++ php4/ext/standard/basic_functions.c Tue Nov 2 09:39:12 1999 @@ -3255,7 +3255,6 @@ /* Populate the pads array */ num_pads = pad_size_abs - input_size; - /*(*pad_value)->refcount += num_pads;*/ pads = (zval **)emalloc(num_pads * sizeof(zval **)); for (i = 0; i < num_pads; i++) pads[i] = pad_value; @@ -3285,7 +3284,7 @@ Bucket ***indirect; Bucket *p; int argc; - int max_size = 0; + int array_size; int i, k; /* Get the argument count and check it */ @@ -3301,13 +3300,17 @@ WRONG_PARAM_COUNT; } + array_size = zend_hash_num_elements((*args[0])->value.ht); for (i = 0; i < argc; i++) { - if (zend_hash_num_elements((*args[i])->value.ht) > max_size) - max_size = zend_hash_num_elements((*args[i])->value.ht); + if (zend_hash_num_elements((*args[i])->value.ht) != array_size) { + php_error(E_WARNING, "Array sizes are inconsistent"); + efree(args); + return; + } } - indirect = (Bucket ***)emalloc(max_size * sizeof(Bucket **)); - for (i = 0; i < max_size; i++) + indirect = (Bucket ***)emalloc(array_size * sizeof(Bucket **)); + for (i = 0; i < array_size; i++) indirect[i] = (Bucket **)emalloc(argc * sizeof(Bucket *)); for (i = 0; i < argc; i++) { @@ -3316,11 +3319,11 @@ indirect[k][i] = p; } - for (; k < max_size; k++) + for (; k < array_size; k++) indirect[k][i] = NULL; } - for (i = 0; i < max_size; i++) + for (i = 0; i < array_size; i++) efree(indirect[i]); efree(indirect); efree(args);