cvs: embed /php-irssi php-irssi-obj.c

wez		Tue Apr  1 09:35:34 2003 EDT

  Modified files:              
    /embed/php-irssi	php-irssi-obj.c 
  Log:
  Should fix some crash issues.
  
  
  
Index: embed/php-irssi/php-irssi-obj.c
diff -u embed/php-irssi/php-irssi-obj.c:1.9 embed/php-irssi/php-irssi-obj.c:1.10
--- embed/php-irssi/php-irssi-obj.c:1.9	Tue Apr  1 07:28:04 2003
+++ embed/php-irssi/php-irssi-obj.c	Tue Apr  1 09:35:34 2003
@@ -14,7 +14,7 @@
   +----------------------------------------------------------------------+
   | Author: Wez Furlong <[email protected]>                                    |
   +----------------------------------------------------------------------+
-  $Id: php-irssi-obj.c,v 1.9 2003/04/01 12:28:04 wez Exp $
+  $Id: php-irssi-obj.c,v 1.10 2003/04/01 14:35:34 wez Exp $
 */
 #include "php-irssi.h"
 #include "php-irssi-obj-defs.h"
@@ -42,28 +42,28 @@
 
 	switch(type) {
 		case PIAT_STRING:
-			ZVAL_STRING(val, *(char **)arg, 1);
+			ZVAL_STRING(val, (char *)arg, 1);
 			break;
 		case PIAT_SERVER:
-			php_irssi_export_SERVER(val, *(SERVER_REC**)arg TSRMLS_CC);
+			php_irssi_export_SERVER(val, (SERVER_REC*)arg TSRMLS_CC);
 			break;
 		case PIAT_CHANNEL:
-			php_irssi_export_CHANNEL(val, *(CHANNEL_REC**)arg TSRMLS_CC);
+			php_irssi_export_CHANNEL(val, (CHANNEL_REC*)arg TSRMLS_CC);
 			break;
 		case PIAT_INT:
-			ZVAL_LONG(val, *(int *)arg);
+			ZVAL_LONG(val, (int)arg);
 			break;
 		case PIAT_ULONG:
-			ZVAL_LONG(val, *(ulong *)arg);
+			ZVAL_LONG(val, (ulong)arg);
 			break;
 		case PIAT_ARRAY_OF_STRING:
 			php_irssi_export_GList(val, (GSList*)arg, PIAT_STRING TSRMLS_CC);
 			break;
 		case PIAT_WI_ITEM:
-			php_irssi_export_WI_ITEM(val, *(WI_ITEM_REC**)arg TSRMLS_CC);
+			php_irssi_export_WI_ITEM(val, (WI_ITEM_REC*)arg TSRMLS_CC);
 			break;
 		case PIAT_WINDOW:
-			php_irssi_export_WINDOW(val, *(WINDOW_REC**)arg TSRMLS_CC);
+			php_irssi_export_WINDOW(val, (WINDOW_REC*)arg TSRMLS_CC);
 			break;
 		case PIAT_NICK:
 			/* We need some context for a NICK */
@@ -74,8 +74,6 @@
 	/* ZVAL_DELREF(val); */
 }
 
-
-
 static zval* pih_read_prop(zval *object, zval *member, int type TSRMLS_DC)
 {
 	struct php_irssi_obj_ref *ref = zend_object_store_get_object(object TSRMLS_CC);
@@ -106,8 +104,8 @@
 
 		return EG(uninitialized_zval_ptr);
 	}
-
-	php_irssi_C_to_PHP(&retval, (*props)->proptype, arg + (*props)->offset);
+	
+	php_irssi_C_to_PHP(&retval, (*props)->proptype, *(void**)(arg + (*props)->offset));
 	
 	return retval;
 }