Revert GNU TLS FIPS-140 changes.

[thirdparty/cups.git] / ppdc / ppdmerge.cxx

diff --git a/ppdc/ppdmerge.cxx b/ppdc/ppdmerge.cxx
index 8c4863e11f2625513caeea022e0903e0a76954b6..94d67ff839a34e38b102f175f34e0dc533193505 100644 (file)
--- a/ppdc/ppdmerge.cxx
+++ b/ppdc/ppdmerge.cxx
@@ -1,16 +1,11 @@
 //
-// "$Id$"
-//
 // PPD file merge utility for the CUPS PPD Compiler.
 //
-// Copyright 2007-2014 by Apple Inc.
-// Copyright 2002-2007 by Easy Software Products.
+// Copyright © 2007-2018 by Apple Inc.
+// Copyright © 2002-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/".
+// Licensed under Apache License v2.0.  See the file "LICENSE" for more
+// information.
 //
 
 //
@@ -44,6 +39,7 @@ main(int  argc,                               // I - Number of command-line arguments
   cups_array_t *ppds;                  // Array of PPD files
   const char   *inname,                // First input filename
                *outname;               // Output filename (if any)
+  char         bckname[1024];          // Backup filename
   cups_file_t  *infile,                // Input file
                *outfile;               // Output file
   cups_array_t *languages;             // Languages in file
@@ -143,9 +139,6 @@ main(int  argc,                             // I - Number of command-line arguments
         if (outname && !strcmp(inname, outname))
        {
          // Rename input filename so that we don't overwrite it...
-         char bckname[1024];           // Backup filename
-
-
          snprintf(bckname, sizeof(bckname), "%s.bck", inname);
 
          if (rename(inname, bckname))
@@ -366,8 +359,3 @@ usage(void)
 
   exit(1);
 }
-
-
-//
-// End of "$Id$".
-//