Mirror fixes from trunk.

Bump version to 1.7.2.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.7@11551 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES.txt b/CHANGES.txt
index a47e895852d6ad2ace0ad173e8a3b2ecdcc456f0..9b50db66af2c7aa12c55e302db81257a8f0144a2 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,11 @@
-CHANGES.txt - 1.7.1 - 2014-01-08
+CHANGES.txt - 1.7.1 - 2014-01-29
 --------------------------------
 
+CHANGES IN CUPS V1.7.2
+
+       - Fixed some clang-reported issues (<rdar://problem/15936066>)
+
+
 CHANGES IN CUPS V1.7.1
 
        - Security: the lppasswd program incorrectly used settings from

diff --git a/INSTALL.txt b/INSTALL.txt
index 27797678d4a13e48ff30b0e3e5640d5c36fe46d3..aa80cedd46042dd31081bdfb537b44c2c59ca510 100644 (file)
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,4 +1,4 @@
-INSTALL - CUPS v1.7.1 - 2014-01-08
+INSTALL - CUPS v1.7.2 - 2014-01-29
 ----------------------------------
 
 This file describes how to compile and install CUPS from source code. For more

diff --git a/README.txt b/README.txt
index 70f10e775fe2b54e801698d5354e7174b1acf45a..5e20771dc1937a6ed339f6ee7343bb176eb3682b 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-README - CUPS v1.7.1 - 2014-01-08
+README - CUPS v1.7.2 - 2014-01-29
 ---------------------------------
 
 Looking for compile instructions?  Read the file "INSTALL.txt" instead...
@@ -149,7 +149,7 @@ PRINTING FILES
 
 LEGAL STUFF
 
-    CUPS is Copyright 2007-2013 by Apple Inc.  CUPS and the CUPS logo are
+    CUPS is Copyright 2007-2014 by Apple Inc.  CUPS and the CUPS logo are
     trademarks of Apple Inc.
 
     The MD5 Digest code is Copyright 1999 Aladdin Enterprises.

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index b961bc132705c11986360022d6a2fa3da04f2f7e..e7a52ee1534d358f69d6e22171800d7749aff59b 100644 (file)
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -1,16 +1,16 @@
 dnl
 dnl "$Id: cups-common.m4 8781 2009-08-28 17:34:54Z mike $"
 dnl
-dnl   Common configuration stuff for CUPS.
+dnl Common configuration stuff for CUPS.
 dnl
-dnl   Copyright 2007-2013 by Apple Inc.
-dnl   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+dnl Copyright 2007-2014 by Apple Inc.
+dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
 dnl
-dnl   These coded instructions, statements, and computer programs are the
-dnl   property of Apple Inc. and are protected by Federal copyright
-dnl   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-dnl   which should have been included with this file.  If this file is
-dnl   file is missing or damaged, see the license at "http://www.cups.org/".
+dnl These coded instructions, statements, and computer programs are the
+dnl property of Apple Inc. and are protected by Federal copyright
+dnl law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+dnl which should have been included with this file.  If this file is
+dnl file is missing or damaged, see the license at "http://www.cups.org/".
 dnl
 
 dnl We need at least autoconf 2.60...
@@ -20,7 +20,7 @@ dnl Set the name of the config header file...
 AC_CONFIG_HEADER(config.h)
 
 dnl Version number information...
-CUPS_VERSION="1.7.1"
+CUPS_VERSION="1.7.2"
 CUPS_REVISION=""
 #if test -z "$CUPS_REVISION" -a -d .svn; then
 #      CUPS_REVISION="-r`svnversion . | awk -F: '{print $NF}' | sed -e '1,$s/[[a-zA-Z]]*//g'`"

diff --git a/cups/cups.h b/cups/cups.h
index b4729107864e12aee03dc864d7ce11b9ca307645..51a97560939fc93266ddb0f94f25f221115744c6 100644 (file)
--- a/cups/cups.h
+++ b/cups/cups.h
@@ -1,18 +1,18 @@
 /*
  * "$Id$"
  *
- *   API definitions for CUPS.
+ * API definitions for CUPS.
  *
- *   Copyright 2007-2013 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products.
+ * Copyright 2007-2014 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products.
  *
- *   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/".
+ * 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/".
  *
- *   This file is subject to the Apple OS-Developed Software exception.
+ * This file is subject to the Apple OS-Developed Software exception.
  */
 
 #ifndef _CUPS_CUPS_H_
@@ -53,10 +53,10 @@ extern "C" {
  * Constants...
  */
 
-#  define CUPS_VERSION                 1.0701
+#  define CUPS_VERSION                 1.0702
 #  define CUPS_VERSION_MAJOR           1
 #  define CUPS_VERSION_MINOR           7
-#  define CUPS_VERSION_PATCH           1
+#  define CUPS_VERSION_PATCH           2
 
 #  define CUPS_BC_FD                   3
                                        /* Back-channel file descriptor for

diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c
index c2b5dc57bd9017ee440916a31cc4df011beab431..013e15c6801608a94da417e6b669b83b3e7d749c 100644 (file)
--- a/cups/http-addrlist.c
+++ b/cups/http-addrlist.c
@@ -455,6 +455,7 @@ httpAddrGetList(const char *hostname,       /* I - Hostname, IP address, or NULL for p
 
     if ((first = (http_addrlist_t *)calloc(1, sizeof(http_addrlist_t))) != NULL)
     {
+      addr = first;
       first->addr.un.sun_family = AF_LOCAL;
       strlcpy(first->addr.un.sun_path, hostname, sizeof(first->addr.un.sun_path));
     }

diff --git a/filter/interpret.c b/filter/interpret.c
index 77157fb97597c64bc3be8939136762c3fe999e72..6c07ccc6b20a5574eab5ffd5031fb4e8b5201d9c 100644 (file)
--- a/filter/interpret.c
+++ b/filter/interpret.c
@@ -470,6 +470,7 @@ _cupsRasterExecPS(
     int                 *preferred_bits,/* O - Preferred bits per color */
     const char          *code)         /* I - PS code to execute */
 {
+  int                  error = 0;      /* Error condition? */
   _cups_ps_stack_t     *st;            /* PostScript value stack */
   _cups_ps_obj_t       *obj;           /* Object from top of stack */
   char                 *codecopy,      /* Copy of code */
@@ -477,7 +478,7 @@ _cupsRasterExecPS(
 
 
   DEBUG_printf(("_cupsRasterExecPS(h=%p, preferred_bits=%p, code=\"%s\")\n",
-                h, preferred_bits, code ? code : "(null)"));
+                h, preferred_bits, code));
 
  /*
   * Copy the PostScript code and create a stack...
@@ -612,12 +613,13 @@ _cupsRasterExecPS(
 
       case CUPS_PS_OTHER :
           _cupsRasterAddError("Unknown operator \"%s\"!\n", obj->value.other);
+         error = 1;
           DEBUG_printf(("_cupsRasterExecPS: Unknown operator \"%s\"!\n",
                        obj->value.other));
           break;
     }
 
-    if (obj && obj->type == CUPS_PS_OTHER)
+    if (error)
       break;
   }