Remove all remnants of the old private PWG APIs and structures.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@13124 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/cups/pwg-private.h b/cups/pwg-private.h
index 26269254f50e03617314f339a91f158ff35d6110..25fb667ae10aec15f46db7b5aebf59ee0b6a2494 100644 (file)
--- a/cups/pwg-private.h
+++ b/cups/pwg-private.h
@@ -1,17 +1,15 @@
 /*
- * "$Id$"
+ * Private PWG media API definitions for CUPS.
  *
- *   Private PWG media API definitions for CUPS.
+ * Copyright 2009-2016 by Apple Inc.
  *
- *   Copyright 2009-2013 by Apple Inc.
+ * 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_PWG_PRIVATE_H_
@@ -34,17 +32,6 @@ extern "C" {
 #  endif /* __cplusplus */
 
 
-/*
- * Deprecated stuff for prior users of the private PWG media API...
- */
-
-#  ifndef _CUPS_NO_DEPRECATED
-typedef struct pwg_map_s _pwg_map_t;
-typedef struct pwg_media_s _pwg_media_t;
-typedef struct pwg_size_s _pwg_size_t;
-#  endif /* _CUPS_NO_DEPRECATED */
-
-
 /*
  * Functions...
  */
@@ -65,7 +52,3 @@ extern pwg_media_t *_pwgMediaNearSize(int width, int length, int epsilon);
 #  endif /* __cplusplus */
 
 #endif /* !_CUPS_PWG_PRIVATE_H_ */
-
-/*
- * End of "$Id$".
- */

diff --git a/filter/rastertopwg.c b/filter/rastertopwg.c
index b47ef2967a977927cfa56e6a8f6a8a26aab4a077..f478ac5807ac20d2ca4e5dab0e0d5308f67f3a84 100644 (file)
--- a/filter/rastertopwg.c
+++ b/filter/rastertopwg.c
@@ -50,8 +50,8 @@ main(int  argc,                               /* I - Number of command-line args */
   ppd_file_t           *ppd;           /* PPD file */
   ppd_attr_t           *back;          /* cupsBackSize attribute */
   _ppd_cache_t         *cache;         /* PPD cache */
-  _pwg_size_t          *pwg_size;      /* PWG media size */
-  _pwg_media_t         *pwg_media;     /* PWG media name */
+  pwg_size_t           *pwg_size;      /* PWG media size */
+  pwg_media_t          *pwg_media;     /* PWG media name */
   int                  num_options;    /* Number of options */
   cups_option_t                *options = NULL;/* Options */
   const char           *val;           /* Option value */

diff --git a/scheduler/printers.c b/scheduler/printers.c
index c3f92777147d1527ac4f3d59e726d6edb45bd7c2..2841adc29f6a929ecb1f50d903a4ffa7ab067570 100644 (file)
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -50,7 +50,7 @@ static int    compare_printers(void *first, void *second, void *data);
 static void    delete_printer_filters(cupsd_printer_t *p);
 static void    dirty_printer(cupsd_printer_t *p);
 static void    load_ppd(cupsd_printer_t *p);
-static ipp_t   *new_media_col(_pwg_size_t *size, const char *source,
+static ipp_t   *new_media_col(pwg_size_t *size, const char *source,
                               const char *type);
 static void    write_xml_string(cups_file_t *fp, const char *s);
 
@@ -3798,8 +3798,8 @@ load_ppd(cupsd_printer_t *p)              /* I - Printer */
   int          xdpi,                   /* Horizontal resolution */
                ydpi;                   /* Vertical resolution */
   const char   *resptr;                /* Pointer into resolution keyword */
-  _pwg_size_t  *pwgsize;               /* Current PWG size */
-  _pwg_map_t   *pwgsource,             /* Current PWG source */
+  pwg_size_t   *pwgsize;               /* Current PWG size */
+  pwg_map_t    *pwgsource,             /* Current PWG source */
                *pwgtype;               /* Current PWG type */
   ipp_attribute_t *attr;               /* Attribute data */
   _ipp_value_t *val;                   /* Attribute value */
@@ -5004,7 +5004,7 @@ load_ppd(cupsd_printer_t *p)              /* I - Printer */
  */
 
 static ipp_t *                         /* O - Collection value */
-new_media_col(_pwg_size_t *size,       /* I - media-size/margin values */
+new_media_col(pwg_size_t *size,        /* I - media-size/margin values */
               const char  *source,     /* I - media-source value */
               const char  *type)       /* I - media-type value */
 {

diff --git a/systemv/cupstestppd.c b/systemv/cupstestppd.c
index e05949138107476952b9642e6e93dbee212ac214..8c48d801f62b51f1785e4609ed1af02d410650f4 100644 (file)
--- a/systemv/cupstestppd.c
+++ b/systemv/cupstestppd.c
@@ -1,20 +1,18 @@
 /*
- * "$Id$"
+ * PPD test program for CUPS.
  *
- *   PPD test program for CUPS.
+ * Copyright 2007-2016 by Apple Inc.
+ * Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
- *   Copyright 2007-2015 by Apple Inc.
- *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
+ * 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/".
+ * PostScript is a trademark of Adobe Systems, Inc.
  *
- *   PostScript is a trademark of Adobe Systems, Inc.
- *
- *   This file is subject to the Apple OS-Developed Software exception.
+ * This file is subject to the Apple OS-Developed Software exception.
  */
 
 /*
@@ -3124,7 +3122,7 @@ check_sizes(ppd_file_t *ppd,              /* I - PPD file */
   const char   *prefix;                /* WARN/FAIL prefix */
   ppd_option_t *page_size,             /* PageSize option */
                *page_region;           /* PageRegion option */
-  _pwg_media_t *pwg_media;             /* PWG media */
+  pwg_media_t  *pwg_media;             /* PWG media */
   char         buf[PPD_MAX_NAME];      /* PapeSize name that is supposed to be */
   const char   *ptr;                   /* Pointer into string */
   int          width_2540ths,          /* PageSize width in 2540ths */
@@ -4033,8 +4031,3 @@ valid_utf8(const char *s)         /* I - String to check */
 
   return (1);
 }
-
-
-/*
- * End of "$Id$".
- */