Update all source headers to use "CUPS" instead of "Common UNIX Printing

[thirdparty/cups.git] / scripting / php / phpcups.c

diff --git a/scripting/php/phpcups.c b/scripting/php/phpcups.c
index a98af196f0c675722c215832f76e4364f360db27..563bd638ffd55954d1ce7b8ec0d1f0eeab799277 100644 (file)
--- a/scripting/php/phpcups.c
+++ b/scripting/php/phpcups.c
@@ -1,9 +1,9 @@
 /*
  * "$Id$"
  *
- *   Printing utilities for the Common UNIX Printing System (CUPS).
+ *   Printing utilities for CUPS.
  *
- *   Copyright 2007 by Apple Inc.
+ *   Copyright 2007-2011 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -29,14 +29,14 @@
  * Include necessary headers...
  */
 
-#include <cups/string.h>
+#include <cups/string-private.h>
 #include "php.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"
 #include "phpcups.h"
 
 
-/* 
+/*
  * PHP function list...
  */
 
@@ -223,7 +223,7 @@ PHP_FUNCTION(cups_cancel_job)
 
 
   if (ZEND_NUM_ARGS() != 2 ||
-      zend_parse_parameters(2, "sl", &dest, &dest_len, &id))
+      zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl", &dest, &dest_len, &id))
   {
     WRONG_PARAM_COUNT;
   }
@@ -320,7 +320,7 @@ PHP_FUNCTION(cups_get_jobs)
 
 
   if (ZEND_NUM_ARGS() != 3 ||
-      zend_parse_parameters(3, "sll", &dest, &dest_len, &myjobs, &completed))
+      zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sll", &dest, &dest_len, &myjobs, &completed))
   {
     WRONG_PARAM_COUNT;
   }
@@ -416,7 +416,7 @@ PHP_FUNCTION(cups_print_file)
 
 
   if (ZEND_NUM_ARGS() != 4 ||
-      zend_parse_parameters(4, "sssa", &dest, &dest_len,
+      zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sssa", &dest, &dest_len,
                             &filename, &filename_len,
                            &title, &title_len, &optionsobj))
   {
@@ -455,7 +455,7 @@ PHP_FUNCTION(cups_print_files)
 
 
   if (ZEND_NUM_ARGS() != 4 ||
-      zend_parse_parameters(4, "sasa", &dest, &dest_len, &filesobj,
+      zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sasa", &dest, &dest_len, &filesobj,
                            &title, &title_len, &optionsobj))
   {
     WRONG_PARAM_COUNT;