Merge changes from CUPS 1.4svn-r7696.

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

diff --git a/cups/testi18n.c b/cups/testi18n.c
index 0fc439793228097333e9d95c3fb222e888c3e501..b18b64668b5d8abd8599e970ff5a9debe3b18c98 100644 (file)
--- a/cups/testi18n.c
+++ b/cups/testi18n.c
@@ -1,25 +1,18 @@
 /*
- * "$Id: testi18n.c 5444 2006-04-20 18:16:54Z mike $"
+ * "$Id: testi18n.c 7560 2008-05-13 06:34:04Z mike $"
  *
  *   Internationalization test for Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 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:
+ *   These coded instructions, statements, and computer programs are the
+ *   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/".
  *
- *       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
+ *   This file is subject to the Apple OS-Developed Software exception.
  *
  * Contents:
  *
@@ -82,7 +75,6 @@ main(int  argc,                               /* I - Argument Count */
     /* "A != <CJK U+4E42>." - use Windows 950 (Big5) or EUC-TW */
   cups_utf8_t  utf8dest[1024];         /* UTF-8 destination string */
   cups_utf32_t utf32dest[1024];        /* UTF-32 destination string */
-  _cups_vmap_t  *vmap;                 /* VBCS charmap pointer */
 
 
  /*
@@ -190,7 +182,7 @@ main(int  argc,                             /* I - Argument Count */
 
   fputs("_cupsCharmapGet(CUPS_EUC_JP): ", stdout);
 
-  if ((vmap = (_cups_vmap_t *)_cupsCharmapGet(CUPS_EUC_JP)) == NULL)
+  if (!_cupsCharmapGet(CUPS_EUC_JP))
   {
     errors ++;
     puts("FAIL");
@@ -204,7 +196,7 @@ main(int  argc,                             /* I - Argument Count */
 
   fputs("_cupsCharmapGet(CUPS_EUC_TW): ", stdout);
 
-  if ((vmap = (_cups_vmap_t *)_cupsCharmapGet(CUPS_EUC_TW)) == NULL)
+  if (!_cupsCharmapGet(CUPS_EUC_TW))
   {
     errors ++;
     puts("FAIL");
@@ -556,5 +548,5 @@ print_utf8(const char            *msg,      /* I - Message String */
 
 
 /*
- * End of "$Id: testi18n.c 5444 2006-04-20 18:16:54Z mike $"
+ * End of "$Id: testi18n.c 7560 2008-05-13 06:34:04Z mike $"
  */