cvs: php4 /ext/printer php_printer.h printer.c

dbeu Wed Dec 13 05:03:24 2000 EDT Modified files: /php4/ext/printer php_printer.h printer.c Log: use true globals, and proper naming cheme

Index: php4/ext/printer/php_printer.h diff -u php4/ext/printer/php_printer.h:1.5 php4/ext/printer/php_printer.h:1.6 --- php4/ext/printer/php_printer.h:1.5 Thu Nov 16 14:16:47 2000 +++ php4/ext/printer/php_printer.h Wed Dec 13 05:03:23 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_printer.h,v 1.5 2000/11/16 22:16:47 dbeu Exp $ */ +/* $Id: php_printer.h,v 1.6 2000/12/13 13:03:23 dbeu Exp $ */ #ifndef PHP_PRINTER_H #define PHP_PRINTER_H @@ -82,12 +82,8 @@ HFONT pointer; } font_struct; - typedef struct { int printer_id; - int pen_id; - int font_id; - int brush_id; } php_printer_globals; #ifdef ZTS Index: php4/ext/printer/printer.c diff -u php4/ext/printer/printer.c:1.7 php4/ext/printer/printer.c:1.8 --- php4/ext/printer/printer.c:1.7 Thu Nov 16 14:16:47 2000 +++ php4/ext/printer/printer.c Wed Dec 13 05:03:23 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: printer.c,v 1.7 2000/11/16 22:16:47 dbeu Exp $ */ +/* $Id: printer.c,v 1.8 2000/12/13 13:03:23 dbeu Exp $ */ #include "php.h" #include "php_ini.h" @@ -35,7 +35,7 @@ php_printer_globals printer_globals; #endif -static int printer_id, brush_id, pen_id, font_id; +static int le_printer, le_brush, le_pen, le_font; #ifdef PHP_WIN32 /* windows headers */ @@ -106,16 +106,16 @@ 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.7 2000/11/16 22:16:47 dbeu Exp $"); + php_info_print_table_row(2, "RCS Version", "$Id: printer.c,v 1.8 2000/12/13 13:03:23 dbeu Exp $"); php_info_print_table_end(); } PHP_MINIT_FUNCTION(printer) { - printer_id = zend_register_list_destructors_ex(destroy_ressources, NULL, "printer", module_number); - pen_id = zend_register_list_destructors_ex(destroy_ressources, NULL, "printer pen", module_number); - font_id = zend_register_list_destructors_ex(destroy_ressources, NULL, "printer font", module_number); - brush_id = zend_register_list_destructors_ex(destroy_ressources, NULL, "printer brush", module_number); + le_printer = zend_register_list_destructors_ex(destroy_ressources, NULL, "printer", module_number); + le_pen = zend_register_list_destructors_ex(destroy_ressources, NULL, "printer pen", module_number); + le_font = zend_register_list_destructors_ex(destroy_ressources, NULL, "printer font", module_number); + le_brush = zend_register_list_destructors_ex(destroy_ressources, NULL, "printer brush", module_number); return SUCCESS; } @@ -153,7 +153,7 @@ resource->info.fwType = 0; resource->info.cbSize = sizeof(resource->info); resource->dc = CreateDC(NULL, resource->name, NULL, resource->device); - ZEND_REGISTER_RESOURCE(return_value, resource, PRINTERG(printer_id)); + ZEND_REGISTER_RESOURCE(return_value, resource, le_printer); } else { php_error(E_WARNING,"couldn't connect to the printer [%s]", resource->name); @@ -176,7 +176,7 @@ WRONG_PARAM_COUNT; } - ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", PRINTERG(printer_id)); + ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", le_printer); if( ClosePrinter(resource->handle) != 0 ) { RETURN_TRUE; @@ -205,7 +205,7 @@ } - ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", PRINTERG(printer_id)); + ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", le_printer); convert_to_string_ex(arg2); resource->data = estrdup((*arg2)->value.str.val); @@ -244,7 +244,7 @@ WRONG_PARAM_COUNT; } - ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", PRINTERG(printer_id)); + ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", le_printer); RETURN_STRING(resource->name,1); } /* }}} */ @@ -367,7 +367,7 @@ WRONG_PARAM_COUNT; } - ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", PRINTERG(printer_id)); + ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", le_printer); convert_to_string_ex(arg2); if(!strcmp((*arg2)->value.str.val,"copies")) { @@ -437,7 +437,7 @@ WRONG_PARAM_COUNT; } - ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", PRINTERG(printer_id)); + ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", le_printer); convert_to_string_ex(arg2); if(!strcmp((*arg2)->value.str.val,"copies")) { @@ -497,7 +497,7 @@ WRONG_PARAM_COUNT; } - ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", PRINTERG(printer_id)); + ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", le_printer); if( resource->dc != NULL ) { php_error(E_NOTICE,"Deleting old DeviceContext"); @@ -522,7 +522,7 @@ WRONG_PARAM_COUNT; } - ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", PRINTERG(printer_id)); + ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", le_printer); if( resource->dc != NULL ) { DeleteDC(resource->dc); @@ -549,7 +549,7 @@ WRONG_PARAM_COUNT; } - ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", PRINTERG(printer_id)); + ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", le_printer); if(StartDoc(resource->dc, &resource->info) < 0) { php_error(E_ERROR,"couldn't allocate new print job"); @@ -574,7 +574,7 @@ WRONG_PARAM_COUNT; } - ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", PRINTERG(printer_id)); + ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", le_printer); if(EndDoc(resource->dc) < 0) { php_error(E_ERROR,"couldn't terminate print job"); @@ -599,7 +599,7 @@ WRONG_PARAM_COUNT; } - ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", PRINTERG(printer_id)); + ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", le_printer); if(StartPage(resource->dc) < 0) { php_error(E_ERROR,"couldn't start a new page"); @@ -624,7 +624,7 @@ WRONG_PARAM_COUNT; } - ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", PRINTERG(printer_id)); + ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", le_printer); if(EndPage(resource->dc) < 0) { php_error(E_ERROR,"couldn't end the page"); @@ -655,7 +655,7 @@ pen->pointer = CreatePen(get_pen_style((*arg1)->value.str.val), (*arg2)->value.lval, hex_to_rgb((*arg3)->value.str.val)); - ZEND_REGISTER_RESOURCE(return_value, pen, PRINTERG(pen_id)); + ZEND_REGISTER_RESOURCE(return_value, pen, le_pen); } /* }}} */ @@ -673,7 +673,7 @@ WRONG_PARAM_COUNT; } - ZEND_FETCH_RESOURCE(pen, pen_struct *, arg1, -1, "Pen Handle", PRINTERG(pen_id)); + ZEND_FETCH_RESOURCE(pen, pen_struct *, arg1, -1, "Pen Handle", le_pen); DeleteObject(pen->pointer); } @@ -694,8 +694,8 @@ WRONG_PARAM_COUNT; } - ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", PRINTERG(printer_id)); - ZEND_FETCH_RESOURCE(pen, pen_struct *, arg1, -1, "Pen Handle", PRINTERG(pen_id)); + ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", le_printer); + ZEND_FETCH_RESOURCE(pen, pen_struct *, arg1, -1, "Pen Handle", le_pen); SelectObject(resource->dc, pen->pointer); } @@ -725,7 +725,7 @@ brush->pointer = CreateHatchBrush(hex_to_rgb((*arg2)->value.str.val), get_hatch_style((*arg1)->value.str.val)); } - ZEND_REGISTER_RESOURCE(return_value, brush, PRINTERG(brush_id)); + ZEND_REGISTER_RESOURCE(return_value, brush, le_brush); } /* }}} */ @@ -743,7 +743,7 @@ WRONG_PARAM_COUNT; } - ZEND_FETCH_RESOURCE(brush, brush_struct *, arg1, -1, "Brush Handle", PRINTERG(brush_id)); + ZEND_FETCH_RESOURCE(brush, brush_struct *, arg1, -1, "Brush Handle", le_brush); DeleteObject(brush->pointer); } @@ -764,8 +764,8 @@ WRONG_PARAM_COUNT; } - ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", PRINTERG(printer_id)); - ZEND_FETCH_RESOURCE(brush, brush_struct *, arg2, -1, "Brush Handle", PRINTERG(brush_id)); + ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", le_printer); + ZEND_FETCH_RESOURCE(brush, brush_struct *, arg2, -1, "Brush Handle", le_brush); SelectObject(resource->dc, brush->pointer); } @@ -785,7 +785,7 @@ WRONG_PARAM_COUNT; } - ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", PRINTERG(printer_id)); + ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", le_printer); convert_to_long_ex(arg2); @@ -807,7 +807,7 @@ WRONG_PARAM_COUNT; } - ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", PRINTERG(printer_id)); + ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", le_printer); convert_to_long_ex(arg2); convert_to_long_ex(arg3); @@ -834,7 +834,7 @@ WRONG_PARAM_COUNT; } - ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", PRINTERG(printer_id)); + ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", le_printer); convert_to_long_ex(arg2); convert_to_long_ex(arg3); @@ -859,7 +859,7 @@ WRONG_PARAM_COUNT; } - ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", PRINTERG(printer_id)); + ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", le_printer); convert_to_long_ex(arg2); convert_to_long_ex(arg3); @@ -884,7 +884,7 @@ WRONG_PARAM_COUNT; } - ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", PRINTERG(printer_id)); + ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", le_printer); convert_to_long_ex(arg2); convert_to_long_ex(arg3); @@ -916,7 +916,7 @@ WRONG_PARAM_COUNT; } - ZEND_FETCH_RESOURCE(font, font_struct *, arg1, -1, "Font Handle", PRINTERG(font_id)); + ZEND_FETCH_RESOURCE(font, font_struct *, arg1, -1, "Font Handle", le_font); DeleteObject(font->pointer); } @@ -937,8 +937,8 @@ WRONG_PARAM_COUNT; } - ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", PRINTERG(printer_id)); - ZEND_FETCH_RESOURCE(font, font_struct *, arg2, -1, "Font Handle", PRINTERG(font_id)); + ZEND_FETCH_RESOURCE(resource, printer *, arg1, -1, "Printer Handle", le_printer); + ZEND_FETCH_RESOURCE(font, font_struct *, arg2, -1, "Font Handle", le_font); SelectObject(resource->dc, font->pointer); }