[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pecl-cvs
Subject:    [PECL-CVS] cvs: pecl /newt newt.c php_newt.h
From:       "Michael Spector" <michael () php ! net>
Date:       2004-12-27 22:11:59
Message-ID: cvsmichael1104185519 () cvsserver
[Download RAW message or body]

michael		Mon Dec 27 17:11:59 2004 EDT

  Modified files:              
    /pecl/newt	newt.c php_newt.h 
  Log:
  - removed unneeded global variable
  - removed debug print
  
  
http://cvs.php.net/diff.php/pecl/newt/newt.c?r1=1.39&r2=1.40&ty=u
Index: pecl/newt/newt.c
diff -u pecl/newt/newt.c:1.39 pecl/newt/newt.c:1.40
--- pecl/newt/newt.c:1.39	Mon Dec 27 15:28:12 2004
+++ pecl/newt/newt.c	Mon Dec 27 17:11:59 2004
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: newt.c,v 1.39 2004/12/27 20:28:12 michael Exp $ */
+/* $Id: newt.c,v 1.40 2004/12/27 22:11:59 michael Exp $ */
 
 #include <newt.h>
 
@@ -208,9 +208,6 @@
 {
 	newt_globals->newt_has_inited = 0;
 
-	newt_globals->php_newt_help_cb_key = emalloc(sizeof("php_newt_help_cb_key"));
-	strcpy (newt_globals->php_newt_help_cb_key, "php_newt_help_cb_key");
-
 	zend_hash_init(&newt_globals->callbacks, 0, NULL, (void (*)(void *)) php_newt_free_cb, 0);
 	zend_hash_init(&newt_globals->data, 0, NULL, ZVAL_PTR_DTOR, 0);
 }
@@ -223,11 +220,9 @@
 	if (newt_globals->newt_has_inited) {
 	  newtFinished();
 	}
-	efree (newt_globals->php_newt_help_cb_key);
-	newt_globals->php_newt_help_cb_key = NULL;
 
-	zend_hash_clean (&newt_globals->callbacks);
-	zend_hash_clean (&newt_globals->data);
+	//zend_hash_clean (&newt_globals->callbacks);
+	//zend_hash_clean (&newt_globals->data);
 }
 /* }}} */
 
@@ -278,41 +273,39 @@
 
 #define PHP_NEWT_STORE_DATA(z_data, key) \
 	do { \
-		zval *z_data_tmp; \
-		MAKE_STD_ZVAL (z_data_tmp); \
-		*z_data_tmp = *(z_data); \
-		zval_copy_ctor (z_data_tmp); \
+		zval *z_data_pnsd; \
+		MAKE_STD_ZVAL (z_data_pnsd); \
+		*z_data_pnsd = *(z_data); \
+		zval_copy_ctor (z_data_pnsd); \
 		if (!key) { \
 			key = emalloc (PHP_NEWT_RK_SIZE+1); \
 			snprintf (key, PHP_NEWT_RK_SIZE, "%x", zend_hash_num_elements(&NEWT_G(data))); \
 		} \
-		zend_hash_update (&NEWT_G(data), key, strlen(key)+1, (void *)&z_data_tmp, sizeof(zval *), NULL); \
+		zend_hash_update (&NEWT_G(data), key, strlen(key)+1, (void *)&z_data_pnsd, sizeof(zval *), NULL); \
 	} while (0)
 
 #define PHP_NEWT_FETCH_DATA(key, z_data) \
 	do { \
-		zval **z_data##z_data = NULL; \
+		zval **z_data_pnfd = NULL; \
 		if (!z_data) { \
 			MAKE_STD_ZVAL (z_data); \
 		} \
-		zend_hash_find (&NEWT_G(data), key, strlen(key)+1, (void **)&z_data##z_data); \
-		*z_data = *(*z_data##z_data); \
+		zend_hash_find (&NEWT_G(data), key, strlen(key)+1, (void **)&z_data_pnfd); \
+		*z_data = *(*z_data_pnfd); \
 		zval_copy_ctor (z_data); \
-		printf ("\nKEY: %s\n", key); \
-		php_var_dump (&z_data, 2 TSRMLS_CC); \
 	} while (0)
 
 #define PHP_NEWT_FETCH_KEY(z_data, key) \
 	do { \
-		zval *z_data##z_data = NULL, z_data##res; \
+		zval *z_data_pnfk = NULL, res_pnfk; \
 		key = NULL; \
 		zend_hash_internal_pointer_reset (&NEWT_G(data)); \
-		while (zend_hash_get_current_data (&NEWT_G(data), (void **)&z_data##z_data) == SUCCESS) { \
-			ulong z_data##id; \
-			uint z_data##key_len; \
-			is_identical_function (&z_data##res, z_data##z_data, z_data); \
-			if(zval_is_true (&z_data##res)) { \
-				zend_hash_get_current_key_ex(&NEWT_G(data), &key, &z_data##key_len, &z_data##id, 0, NULL); \
+		while (zend_hash_get_current_data (&NEWT_G(data), (void **)&z_data_pnfk) == SUCCESS) { \
+			ulong id_pnfk; \
+			uint keylen_pnfk; \
+			is_identical_function (&res_pnfk, z_data_pnfk, z_data); \
+			if(zval_is_true (&res_pnfk)) { \
+				zend_hash_get_current_key_ex(&NEWT_G(data), &key, &keylen_pnfk, &id_pnfk, 0, NULL); \
 				break; \
 			} \
 			zend_hash_move_forward(&NEWT_G(data)); \
@@ -330,9 +323,9 @@
 
 #define PHP_NEWT_FETCH_CALLBACK(key, cb) \
 	do { \
-		php_newt_cb **cb##cb = NULL; \
-		zend_hash_find (&NEWT_G(callbacks), (char *)key, strlen(key)+1, (void **)&cb##cb); \
-		cb = *cb##cb; \
+		php_newt_cb **cb_pnfc = NULL; \
+		zend_hash_find (&NEWT_G(callbacks), (char *)key, strlen(key)+1, (void **)&cb_pnfc); \
+		cb = *cb_pnfc; \
 	} while (0)
 
 /* {{{ PHP_MINIT_FUNCTION
@@ -475,9 +468,9 @@
  */
 PHP_MSHUTDOWN_FUNCTION(newt)
 {
-//#ifndef ZTS
-//	php_newt_destroy_globals (&newt_globals TSRMLS_CC);
-//#endif
+#ifndef ZTS
+	php_newt_destroy_globals (&newt_globals TSRMLS_CC);
+#endif
 
 	return SUCCESS;
 }
@@ -601,7 +594,7 @@
 	
 	TSRMLS_FETCH();
 
-	PHP_NEWT_FETCH_CALLBACK (NEWT_G(php_newt_help_cb_key), cb);
+	PHP_NEWT_FETCH_CALLBACK ("php_newt_help_cb_key", cb);
 
 	/* First argument is component resource */
 	MAKE_STD_ZVAL (args[0]);
@@ -869,7 +862,7 @@
 	*cb->callback = *z_callback;
 	zval_copy_ctor(cb->callback);
 
-	cb->key = NEWT_G(php_newt_help_cb_key);
+	cb->key = estrdup("php_newt_help_cb_key");
 	PHP_NEWT_STORE_CALLBACK (cb);
 	newtSetHelpCallback ((newtCallback) newt_help_callback_wrapper);
 }
http://cvs.php.net/diff.php/pecl/newt/php_newt.h?r1=1.9&r2=1.10&ty=u
Index: pecl/newt/php_newt.h
diff -u pecl/newt/php_newt.h:1.9 pecl/newt/php_newt.h:1.10
--- pecl/newt/php_newt.h:1.9	Mon Dec 27 12:57:10 2004
+++ pecl/newt/php_newt.h	Mon Dec 27 17:11:59 2004
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: php_newt.h,v 1.9 2004/12/27 17:57:10 michael Exp $ */
+/* $Id: php_newt.h,v 1.10 2004/12/27 22:11:59 michael Exp $ */
 
 #include <newt.h>
 
@@ -199,7 +199,6 @@
 ZEND_BEGIN_MODULE_GLOBALS (newt)
 	HashTable callbacks;
 	HashTable data;
-	char *php_newt_help_cb_key;
 	int newt_has_inited;
 ZEND_END_MODULE_GLOBALS (newt)
 

-- 
PECL CVS Mailing List 
To unsubscribe, visit: http://www.php.net/unsub.php

[prev in list] [next in list] [prev in thread] [next in thread]