2nd phase in back-substitution those macro's

I've got pretty much everything now...

6 files changed, 10 insertions, 10 deletions

diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index 55f38023c9..5173087c46 100644
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -310,15 +310,15 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 	}
 	
 	for(hptr = handler; hptr->name &&
-			strcasecmp(hptr->name, (*args[2])->value.str.val); hptr++);
+			strcasecmp(hptr->name, Z_STRVAL_PP(args[2])); hptr++);
 
 	if(!hptr->name) {
-		php_error(E_WARNING, "no such handler: %s", (*args[2])->value.str.val);
+		php_error(E_WARNING, "no such handler: %s", Z_STRVAL_PP(args[2]));
 		FREENOW;
 		RETURN_FALSE;
 	}
 
-	switch((*args[1])->value.str.val[0]) {
+	switch(Z_STRVAL_PP(args[1])[0]) {
 		case 'c': 
 			modenr = DBA_CREAT; 
 			break;
@@ -332,14 +332,14 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 			modenr = DBA_TRUNC;
 			break;
 		default:
-			php_error(E_WARNING, "illegal DBA mode: %s", (*args[1])->value.str.val);
+			php_error(E_WARNING, "illegal DBA mode: %s", Z_STRVAL_PP(args[1]));
 			FREENOW;
 			RETURN_FALSE;
 	}
 			
 	info = malloc(sizeof(*info));
 	memset(info, 0, sizeof(info));
-	info->path = strdup((*args[0])->value.str.val);
+	info->path = strdup(Z_STRVAL_PP(args[0]));
 	info->mode = modenr;
 	info->argc = ac - 3;
 	info->argv = args + 3;
diff --git a/ext/dba/dba_db2.c b/ext/dba/dba_db2.c
index 16076f7ebf..2b4f7464a0 100644
--- a/ext/dba/dba_db2.c
+++ b/ext/dba/dba_db2.c
@@ -62,7 +62,7 @@ DBA_OPEN_FUNC(db2)
 
 	if(info->argc > 0) {
 		convert_to_long_ex(info->argv[0]);
-		filemode = (*info->argv[0])->value.lval;
+		filemode = Z_LVAL_PP(info->argv[0]);
 	}
 
 	if(!db_open(info->path, type, gmode, filemode, NULL, NULL, &dbp)) {
diff --git a/ext/dba/dba_db3.c b/ext/dba/dba_db3.c
index 861fbe9fb6..0df8dc930c 100644
--- a/ext/dba/dba_db3.c
+++ b/ext/dba/dba_db3.c
@@ -64,7 +64,7 @@ DBA_OPEN_FUNC(db3)
 
 	if (info->argc > 0) {
 		convert_to_long_ex(info->argv[0]);
-		filemode = (*info->argv[0])->value.lval;
+		filemode = Z_LVAL_PP(info->argv[0]);
 	}
 
 	if (db_create(&dbp, NULL, 0) == 0 &&
diff --git a/ext/dba/dba_dbm.c b/ext/dba/dba_dbm.c
index f8d1a96735..20be3a63ab 100644
--- a/ext/dba/dba_dbm.c
+++ b/ext/dba/dba_dbm.c
@@ -52,7 +52,7 @@ DBA_OPEN_FUNC(dbm)
 
 	if(info->argc > 0) {
 		convert_to_long_ex(info->argv[0]);
-		filemode = (*info->argv[0])->value.lval;
+		filemode = Z_LVAL_PP(info->argv[0]);
 	}
 	
 	if(info->mode == DBA_TRUNC) {
diff --git a/ext/dba/dba_gdbm.c b/ext/dba/dba_gdbm.c
index df6c34280d..181be0566b 100644
--- a/ext/dba/dba_gdbm.c
+++ b/ext/dba/dba_gdbm.c
@@ -49,7 +49,7 @@ DBA_OPEN_FUNC(gdbm)
 
 	if(info->argc > 0) {
 		convert_to_long_ex(info->argv[0]);
-		filemode = (*info->argv[0])->value.lval;
+		filemode = Z_LVAL_PP(info->argv[0]);
 	}
 
 	dbf = gdbm_open(info->path, 0, gmode, filemode, NULL);
diff --git a/ext/dba/dba_ndbm.c b/ext/dba/dba_ndbm.c
index a6117805c6..529fe1f5dd 100644
--- a/ext/dba/dba_ndbm.c
+++ b/ext/dba/dba_ndbm.c
@@ -56,7 +56,7 @@ DBA_OPEN_FUNC(ndbm)
 
 	if(info->argc > 0) {
 		convert_to_long_ex(info->argv[0]);
-		filemode = (*info->argv[0])->value.lval;
+		filemode = Z_LVAL_PP(info->argv[0]);
 	}
 
 	dbf = dbm_open(info->path, gmode, filemode);