dbeu            Tue Mar 13 06:24:26 2001 EDT

  Modified files:              
    /php4/ext/printer   printer.c 
  Log:
  nuke alot unnecessary globals fetches
  
Index: php4/ext/printer/printer.c
diff -u php4/ext/printer/printer.c:1.9 php4/ext/printer/printer.c:1.10
--- php4/ext/printer/printer.c:1.9      Sun Feb 25 22:07:13 2001
+++ php4/ext/printer/printer.c  Tue Mar 13 06:24:25 2001
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: printer.c,v 1.9 2001/02/26 06:07:13 andi Exp $ */
+/* $Id: printer.c,v 1.10 2001/03/13 14:24:25 dbeu Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -106,7 +106,7 @@
        php_info_print_table_row(2, "Printer Support", "enabled");
        php_info_print_table_row(2, "Default printing device", default_printer ? 
default_printer : "<b>not detected</b>");
        php_info_print_table_row(2, "Module state", "experimental");
-       php_info_print_table_row(2, "RCS Version", "$Id: printer.c,v 1.9 2001/02/26 
06:07:13 andi Exp $");
+       php_info_print_table_row(2, "RCS Version", "$Id: printer.c,v 1.10 2001/03/13 
+14:24:25 dbeu Exp $");
        php_info_print_table_end();
 }
 
@@ -127,8 +127,6 @@
        pval **arg1;
        printer *resource;
 
-       PRINTERLS_FETCH();
-
        resource = (printer *)emalloc(sizeof(printer));
 
        /* use the given printer */
@@ -170,8 +168,6 @@
        pval **arg1;
        printer *resource;
 
-       PRINTERLS_FETCH();
-
        if ( zend_get_parameters_ex(1, &arg1) == FAILURE ) {
                WRONG_PARAM_COUNT;
        }
@@ -198,8 +194,6 @@
        LPDWORD recieved = NULL;
        int sd, sp = 0;
 
-       PRINTERLS_FETCH();
-
        if ( zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE ) {
                WRONG_PARAM_COUNT;
        }
@@ -238,8 +232,6 @@
        pval **arg1;
        printer *resource;
 
-       PRINTERLS_FETCH();
-
        if ( zend_get_parameters_ex(1, &arg1) == FAILURE ) {
                WRONG_PARAM_COUNT;
        }
@@ -361,8 +353,6 @@
        pval **arg1, **arg2, **arg3;
        printer *resource;
 
-       PRINTERLS_FETCH();
-
        if( zend_get_parameters_ex(3, &arg1, &arg2, &arg3) == FAILURE ) {
                WRONG_PARAM_COUNT;
        }
@@ -431,8 +421,6 @@
        pval **arg1, **arg2;
        printer *resource;
 
-       PRINTERLS_FETCH();
-
        if( zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE ) {
                WRONG_PARAM_COUNT;
        }
@@ -491,8 +479,6 @@
        pval **arg1;
        printer *resource;
 
-       PRINTERLS_FETCH();
-
        if( zend_get_parameters_ex(1, &arg1) == FAILURE ) {
                WRONG_PARAM_COUNT;
        }
@@ -516,8 +502,6 @@
        pval **arg1;
        printer *resource;
 
-       PRINTERLS_FETCH();
-
        if( zend_get_parameters_ex(1, &arg1) == FAILURE ) {
                WRONG_PARAM_COUNT;
        }
@@ -543,8 +527,6 @@
        pval **arg1;
        printer *resource;
 
-       PRINTERLS_FETCH();
-
        if( zend_get_parameters_ex(1, &arg1) == FAILURE ) {
                WRONG_PARAM_COUNT;
        }
@@ -568,8 +550,6 @@
        pval **arg1;
        printer *resource;
 
-       PRINTERLS_FETCH();
-
        if( zend_get_parameters_ex(1, &arg1) == FAILURE ) {
                WRONG_PARAM_COUNT;
        }
@@ -593,8 +573,6 @@
        pval **arg1;
        printer *resource;
 
-       PRINTERLS_FETCH();
-
        if( zend_get_parameters_ex(1, &arg1) == FAILURE ) {
                WRONG_PARAM_COUNT;
        }
@@ -618,8 +596,6 @@
        pval **arg1;
        printer *resource;
 
-       PRINTERLS_FETCH();
-
        if( zend_get_parameters_ex(1, &arg1) == FAILURE ) {
                WRONG_PARAM_COUNT;
        }
@@ -643,8 +619,6 @@
        pval **arg1, **arg2, **arg3;
        pen_struct *pen = emalloc(sizeof(pen_struct));
 
-       PRINTERLS_FETCH();
-
        if( zend_get_parameters_ex(3, &arg1, &arg2, &arg3) == FAILURE ) {
                WRONG_PARAM_COUNT;
        }
@@ -667,8 +641,6 @@
        pval **arg1;
        pen_struct *pen;
 
-       PRINTERLS_FETCH();
-
        if( zend_get_parameters_ex(1, &arg1) == FAILURE ) {
                WRONG_PARAM_COUNT;
        }
@@ -688,8 +660,6 @@
        pen_struct *pen;
        printer *resource;
 
-       PRINTERLS_FETCH();
-
        if( zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE ) {
                WRONG_PARAM_COUNT;
        }
@@ -709,8 +679,6 @@
        pval **arg1, **arg2;
        brush_struct *brush = emalloc(sizeof(brush_struct));
 
-       PRINTERLS_FETCH();
-
        if( zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE ) {
                WRONG_PARAM_COUNT;
        }
@@ -736,8 +704,6 @@
 {
        pval **arg1;
        brush_struct *brush;
-       
-       PRINTERLS_FETCH();
 
        if( zend_get_parameters_ex(1, &arg1) == FAILURE ) {
                WRONG_PARAM_COUNT;
@@ -758,8 +724,6 @@
        brush_struct *brush;
        printer *resource;
 
-       PRINTERLS_FETCH();
-
        if( zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE ) {
                WRONG_PARAM_COUNT;
        }
@@ -779,8 +743,6 @@
        pval **arg1, **arg2;
        printer *resource;
 
-       PRINTERLS_FETCH();
-
        if( zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE ) {
                WRONG_PARAM_COUNT;
        }
@@ -800,8 +762,6 @@
 {
        pval **arg1, **arg2, **arg3, **arg4, **arg5, **arg6, **arg7; 
        printer *resource;
-
-       PRINTERLS_FETCH();
        
        if( zend_get_parameters_ex(7, &arg1, &arg2, &arg3, &arg4, &arg5, &arg6, &arg7) 
== FAILURE ) {
                WRONG_PARAM_COUNT;
@@ -828,8 +788,6 @@
        pval **arg1, **arg2, **arg3, **arg4, **arg5; 
        printer *resource;
 
-       PRINTERLS_FETCH();
-
        if( zend_get_parameters_ex(5, &arg1, &arg2, &arg3, &arg4, &arg5) == FAILURE ) {
                WRONG_PARAM_COUNT;
        }
@@ -853,8 +811,6 @@
        pval **arg1, **arg2, **arg3, **arg4, **arg5; 
        printer *resource;
 
-       PRINTERLS_FETCH();
-
        if( zend_get_parameters_ex(5, &arg1, &arg2, &arg3, &arg4, &arg5) == FAILURE ) {
                WRONG_PARAM_COUNT;
        }
@@ -878,8 +834,6 @@
        pval **arg1, **arg2, **arg3, **arg4; 
        printer *resource;
 
-       PRINTERLS_FETCH();
-
        if( zend_get_parameters_ex(4, &arg1, &arg2, &arg3, &arg4) == FAILURE ) {
                WRONG_PARAM_COUNT;
        }
@@ -910,8 +864,6 @@
        pval **arg1; 
        font_struct *font;
 
-       PRINTERLS_FETCH();
-
        if( zend_get_parameters_ex(1, &arg1) == FAILURE ) {
                WRONG_PARAM_COUNT;
        }
@@ -930,8 +882,6 @@
        pval **arg1, **arg2;
        font_struct *font;
        printer *resource;
-
-       PRINTERLS_FETCH();
 
        if( zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE ) {
                WRONG_PARAM_COUNT;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

Reply via email to