Load cups into easysw/current.

[thirdparty/cups.git] / cups / testipp.c

diff --git a/cups/testipp.c b/cups/testipp.c
index dbe50b54d6847e3f6c55cc0459b044ede867c54b..aa119ace90176d30b3ce1219f3b1aa837ef9c3ef 100644 (file)
--- a/cups/testipp.c
+++ b/cups/testipp.c
@@ -1,25 +1,16 @@
 /*
- * "$Id: testipp.c 4731 2005-09-30 23:11:10Z mike $"
+ * "$Id: testipp.c 6649 2007-07-11 21:46:42Z mike $"
  *
  *   IPP test program for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2005 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *
@@ -36,7 +27,7 @@
 #include <stdlib.h>
 #include <cups/string.h>
 #include <errno.h>
-#include "ipp.h"
+#include "ipp-private.h"
 #ifdef WIN32
 #  include <io.h>
 #else
@@ -144,8 +135,8 @@ ipp_uchar_t collection[] =                  /* Collection buffer */
 
 void   hex_dump(const char *title, ipp_uchar_t *buffer, int bytes);
 void   print_attributes(ipp_t *ipp, int indent);
-int    read_cb(void *data, ipp_uchar_t *buffer, int bytes);
-int    write_cb(void *data, ipp_uchar_t *buffer, int bytes);
+ssize_t        read_cb(void *data, ipp_uchar_t *buffer, size_t bytes);
+ssize_t        write_cb(void *data, ipp_uchar_t *buffer, size_t bytes);
 
 
 /*
@@ -282,6 +273,19 @@ main(int  argc,                    /* I - Number of command-line arguments */
 
     ippDelete(request);
 
+   /*
+    * Test _ippFindOption() private API...
+    */
+
+    fputs("_ippFindOption(\"printer-type\"): ", stdout);
+    if (_ippFindOption("printer-type"))
+      puts("PASS");
+    else
+    {
+      puts("FAIL");
+      status = 1;
+    }
+
    /*
     * Summarize...
     */
@@ -594,10 +598,10 @@ print_attributes(ipp_t *ipp,              /* I - IPP request */
  * 'read_cb()' - Read data from a buffer.
  */
 
-int                                    /* O - Number of bytes read */
+ssize_t                                        /* O - Number of bytes read */
 read_cb(void        *data,             /* I - Data */
         ipp_uchar_t *buffer,           /* O - Buffer to read */
-       int         bytes)              /* I - Number of bytes to read */
+       size_t      bytes)              /* I - Number of bytes to read */
 {
   int  count;                          /* Number of bytes */
 
@@ -621,10 +625,10 @@ read_cb(void        *data,                /* I - Data */
  * 'write_cb()' - Write data into a buffer.
  */
 
-int                                    /* O - Number of bytes written */
+ssize_t                                        /* O - Number of bytes written */
 write_cb(void        *data,            /* I - Data */
          ipp_uchar_t *buffer,          /* I - Buffer to write */
-        int         bytes)             /* I - Number of bytes to write */
+        size_t      bytes)             /* I - Number of bytes to write */
 {
   int  count;                          /* Number of bytes */
 
@@ -645,5 +649,5 @@ write_cb(void        *data,         /* I - Data */
 
 
 /*
- * End of "$Id: testipp.c 4731 2005-09-30 23:11:10Z mike $".
+ * End of "$Id: testipp.c 6649 2007-07-11 21:46:42Z mike $".
  */