New upstream version 5.2.13

1 files changed, 7 insertions, 23 deletions

diff --git a/src/cups/genppd.c b/src/cups/genppd.c
index 49c13a9..2e47f34 100644
--- a/src/cups/genppd.c
+++ b/src/cups/genppd.c
@@ -200,7 +200,8 @@ static gpFile	gpopen(const char *path, const char *mode);
 static int	gpclose(gpFile f);
 #endif /* !CUPS_DRIVER_INTERFACE */
 static int	gpputs(gpFile f, const char *s);
-static int	gpprintf(gpFile f, const char *format, ...);
+static int	gpprintf(gpFile f, const char *format, ...)
+       __attribute__((format(__printf__, 2, 3)));
 static char	**getlangs(void);
 static int	is_special_option(const char *name);
 static void	print_group_close(gpFile fp, stp_parameter_class_t p_class,
@@ -559,11 +560,11 @@ main(int  argc,			    /* I - Number of command-line arguments */
       break;
     }
   }
-#ifdef HAVE_LIBZ  
+#ifdef HAVE_LIBZ
   if (use_compression)
     gpext = ".gz";
   else
-#endif	  
+#endif
     gpext = "";
   if (optind < argc) {
     int n, numargs;
@@ -661,7 +662,7 @@ main(int  argc,			    /* I - Number of command-line arguments */
       for (i = 0; i < stp_printer_model_count(); i++)
 	{
 	  printer = stp_get_printer_by_index(i);
-	  
+
 	  if (i % parallel == rotor && printer)
 	    {
 	      if (! verbose && (i % 50) == 0)
@@ -1194,7 +1195,7 @@ print_ppd_header_3(gpFile fp, ppd_type_t ppd_type, int model,
   gpputs(fp, "*TTRasterizer:	Type42\n");
 
   gpputs(fp, "*cupsVersion:	1.2\n");
-  
+
   gpprintf(fp, "*cupsFilter:	\"application/vnd.cups-raster 100 rastertogutenprint.%s\"\n", GUTENPRINT_RELEASE_VERSION);
   if (strcasecmp(manufacturer, "EPSON") == 0)
     gpputs(fp, "*cupsFilter:	\"application/vnd.cups-command 33 commandtoepson\"\n");
@@ -1776,18 +1777,6 @@ print_one_option(gpFile fp, stp_vars_t *v, const stp_string_list_t *po,
       print_close_ui = 0;
       gpprintf(fp, "*CloseUI: *Stp%s\n\n", desc->name);
 
-#if 0
-      /* This needs to be enabled if/when dimensions become floating point */
-      /*
-       * Add custom option code and value parameter...
-       */
-
-      gpprintf(fp, "*CustomStp%s True: \"pop\"\n", desc->name);
-      gpprintf(fp, "*ParamCustomStp%s Value/%s: 1 points %d %d\n\n",
-	       desc->name, _("Value"), desc->bounds.dimension.lower,
-	       desc->bounds.dimension.upper);
-#endif
-
       break;
     case STP_PARAMETER_TYPE_INT:
       gpprintf(fp, "*OPOptionHints Stp%s: \"input spinbox\"\n", lparam->name);
@@ -1911,11 +1900,6 @@ print_one_localization(gpFile fp, const stp_string_list_t *po,
 	  gpprintf(fp, "*%s.Stp%s %d/%s: \"\"\n", lang,
 		   desc->name, i, dimstr);
 	}
-#if 0
-      /* This needs to be enabled if/when dimensions are floating point */
-      gpprintf(fp, "*%s.ParamCustomStp%s Value/%s: \"\"\n", lang,
-	       desc->name, _("Value"));
-#endif
       break;
 
     case STP_PARAMETER_TYPE_INT:
@@ -2621,7 +2605,7 @@ write_ppd(
 		}
 	    }
 	  stp_parameter_description_destroy(&desc);
-	  
+
 	  /*
 	   * Quality settings
 	   */