cvs: php-gtk /ext/gtk+ gtk.overrides
| From: | Anant Narayanan | Date: | Sun, 10 Dec 2006 17:22:04 +0000 |
| Subject: | cvs: php-gtk /ext/gtk+ gtk.overrides | ||
| Groups: | php.gtk.cvs | ||
| Request: | Send a blank email to php-gtk-cvs+get-2582@lists.php.net to get a copy of this message | ||
anant Sun Dec 10 17:22:04 2006 UTC
Modified files:
/php-gtk/ext/gtk+ gtk.overrides
Log:
Clarify safe_emalloc() calls.
http://cvs.php.net/viewvc.cgi/php-gtk/ext/gtk+/gtk.overrides?r1=1.223&r2=1.224&diff_format=u
Index: php-gtk/ext/gtk+/gtk.overrides
diff -u php-gtk/ext/gtk+/gtk.overrides:1.223 php-gtk/ext/gtk+/gtk.overrides:1.224
--- php-gtk/ext/gtk+/gtk.overrides:1.223 Sat Dec 9 23:07:43 2006
+++ php-gtk/ext/gtk+/gtk.overrides Sun Dec 10 17:22:03 2006
@@ -849,7 +849,7 @@
}
arr_count = zend_hash_num_elements(Z_ARRVAL_P(arr));
- artists = safe_emalloc(arr_count+1, sizeof (gchar *), 0);
+ artists = safe_emalloc(sizeof(gchar *), arr_count+1, 0);
for (i=0, zend_hash_internal_pointer_reset(Z_ARRVAL_P(arr));
zend_hash_get_current_data(Z_ARRVAL_P(arr), (void **)&data) == SUCCESS;
@@ -888,7 +888,7 @@
}
arr_count = zend_hash_num_elements(Z_ARRVAL_P(arr));
- authors = safe_emalloc(arr_count+1, sizeof (gchar *), 0);
+ authors = safe_emalloc(sizeof(gchar *), arr_count+1, 0);
for (i=0, zend_hash_internal_pointer_reset(Z_ARRVAL_P(arr));
zend_hash_get_current_data(Z_ARRVAL_P(arr), (void **)&data) == SUCCESS;
@@ -927,7 +927,7 @@
}
arr_count = zend_hash_num_elements(Z_ARRVAL_P(arr));
- doccers = safe_emalloc(arr_count+1, sizeof (gchar *), 0);
+ doccers = safe_emalloc(sizeof(gchar *), arr_count+1, 0);
for (i=0, zend_hash_internal_pointer_reset(Z_ARRVAL_P(arr));
zend_hash_get_current_data(Z_ARRVAL_P(arr), (void **)&data) == SUCCESS;
@@ -2031,7 +2031,7 @@
if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "i", &num))
return;
- vector = safe_emalloc(num, sizeof (gfloat *), 0);
+ vector = safe_emalloc(sizeof(gfloat *), num, 0);
gtk_curve_get_vector(GTK_CURVE(PHPG_GOBJECT(this_ptr)), num, vector);
@@ -2056,7 +2056,7 @@
return;
num = zend_hash_num_elements(Z_ARRVAL_P(points));
- vectors = safe_emalloc(num, sizeof (gfloat *), 0);
+ vectors = safe_emalloc(sizeof(gfloat *), num, 0);
zend_hash_internal_pointer_reset(Z_ARRVAL_P(points));
while (zend_hash_get_current_data(Z_ARRVAL_P(points), (void **)&data)
@@ -2321,7 +2321,7 @@
{
gunichar ichar;
gint len;
- gchar *ret = safe_emalloc(6, sizeof (gchar *), 0);
+ gchar *ret = safe_emalloc(sizeof(gchar *), 6, 0);
gchar *cp_ret;
gsize cp_len;
zend_bool free_result = FALSE;
@@ -4229,7 +4229,7 @@
}
arr_count = zend_hash_num_elements(Z_ARRVAL_P(arr));
- uris = safe_emalloc(arr_count+1, sizeof (gchar *), 0);
+ uris = safe_emalloc(sizeof(gchar *), arr_count+1, 0);
for (i=0, zend_hash_internal_pointer_reset(Z_ARRVAL_P(arr));
zend_hash_get_current_data(Z_ARRVAL_P(arr), (void **)&data) == SUCCESS;