Fix compile issues (Issue #5)

michaelrsweet · michaelrsweet · commit 1abdcef98c0a · 2025-10-29T17:31:25.000-04:00
diff --git a/commands/lp.c b/commands/lp.c
@@ -1,7 +1,7 @@
 //
 // "lp" and "lpr" commands for CUPS.
 //
-// Copyright © 2021-2023 by OpenPrinting.
+// Copyright © 2021-2025 by OpenPrinting.
 // Copyright © 2007-2021 by Apple Inc.
 // Copyright © 1997-2007 by Easy Software Products.
 //
@@ -240,7 +240,7 @@ main(int  argc,				// I - Number of command-line arguments
 	  case 'o' : // Option
 	      if (opt[1] != '\0')
 	      {
-		num_options = cupsParseOptions(opt + 1, num_options, &options);
+		num_options = cupsParseOptions(opt + 1, /*end*/NULL, num_options, &options);
 		opt += strlen(opt) - 1;
 	      }
 	      else
@@ -253,7 +253,7 @@ main(int  argc,				// I - Number of command-line arguments
 		  return (usage(stderr, command));
 		}
 
-		num_options = cupsParseOptions(argv[i], num_options, &options);
+		num_options = cupsParseOptions(argv[i], /*end*/NULL, num_options, &options);
 	      }
 	      break;
 
diff --git a/commands/lpadmin.c b/commands/lpadmin.c
@@ -1,7 +1,7 @@
 //
 // "lpadmin" command for CUPS.
 //
-// Copyright © 2021-2023 by OpenPrinting.
+// Copyright © 2021-2025 by OpenPrinting.
 // Copyright © 2007-2021 by Apple Inc.
 // Copyright © 1997-2006 by Easy Software Products.
 //
@@ -277,7 +277,7 @@ main(int  argc,				// I - Number of command-line arguments
 	  case 'o' : // -o OPTION=VALUE
 	      if (opt[1] != '\0')
 	      {
-		num_options = cupsParseOptions(opt + 1, num_options, &options);
+		num_options = cupsParseOptions(opt + 1, /*end*/NULL, num_options, &options);
 		opt += strlen(opt) - 1;
 	      }
 	      else
@@ -290,7 +290,7 @@ main(int  argc,				// I - Number of command-line arguments
 		  return (usage(stderr));
 		}
 
-		num_options = cupsParseOptions(argv[i], num_options, &options);
+		num_options = cupsParseOptions(argv[i], /*end*/NULL, num_options, &options);
 	      }
 	      break;
 
diff --git a/commands/lpr.c b/commands/lpr.c
@@ -1,7 +1,7 @@
 //
 // "lpr" command for CUPS.
 //
-// Copyright © 2021-2023 by OpenPrinting.
+// Copyright © 2021-2025 by OpenPrinting.
 // Copyright © 2007-2019 by Apple Inc.
 // Copyright © 1997-2007 by Easy Software Products.
 //
@@ -150,7 +150,7 @@ main(int  argc,				// I - Number of command-line arguments
 	  case 'o' : // Option
 	      if (opt[1] != '\0')
 	      {
-		num_options = cupsParseOptions(opt + 1, num_options, &options);
+		num_options = cupsParseOptions(opt + 1, /*end*/NULL, num_options, &options);
 		opt += strlen(opt) - 1;
 	      }
 	      else
@@ -162,7 +162,7 @@ main(int  argc,				// I - Number of command-line arguments
 		  usage();
 		}
 
-		num_options = cupsParseOptions(argv[i], num_options, &options);
+		num_options = cupsParseOptions(argv[i], /*end*/NULL, num_options, &options);
 	      }
 	      break;
 
diff --git a/daemon/transform.c b/daemon/transform.c
@@ -1,7 +1,7 @@
 //
 // Transform support for cupslocald.
 //
-// Copyright © 2023-2024 by OpenPrinting.
+// Copyright © 2023-2025 by OpenPrinting.
 //
 // Licensed under Apache License v2.0.  See the file "LICENSE" for more
 // information.
@@ -375,7 +375,7 @@ process_attr_message(
 
 
   // Grab attributes from the message line...
-  num_options = cupsParseOptions(message, num_options, &options);
+  num_options = cupsParseOptions(message, /*end*/NULL, num_options, &options);
 
   if ((value = cupsGetIntegerOption("job-impressions", num_options, options)) > 0)
     papplJobSetImpressions(job, value);

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`//`
`2`	`2`	`// "lp" and "lpr" commands for CUPS.`
`3`	`3`	`//`
`4`		`-// Copyright © 2021-2023 by OpenPrinting.`
	`4`	`+// Copyright © 2021-2025 by OpenPrinting.`
`5`	`5`	`// Copyright © 2007-2021 by Apple Inc.`
`6`	`6`	`// Copyright © 1997-2007 by Easy Software Products.`
`7`	`7`	`//`
`@@ -240,7 +240,7 @@ main(int argc, // I - Number of command-line arguments`
`240`	`240`	`case 'o' : // Option`
`241`	`241`	`if (opt[1] != '\0')`
`242`	`242`	`{`
`243`		`- num_options = cupsParseOptions(opt + 1, num_options, &options);`
	`243`	`+ num_options = cupsParseOptions(opt + 1, /end/NULL, num_options, &options);`
`244`	`244`	`opt += strlen(opt) - 1;`
`245`	`245`	`}`
`246`	`246`	`else`
`@@ -253,7 +253,7 @@ main(int argc, // I - Number of command-line arguments`
`253`	`253`	`return (usage(stderr, command));`
`254`	`254`	`}`
`255`	`255`
`256`		`- num_options = cupsParseOptions(argv[i], num_options, &options);`
	`256`	`+ num_options = cupsParseOptions(argv[i], /end/NULL, num_options, &options);`
`257`	`257`	`}`
`258`	`258`	`break;`
`259`	`259`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`//`
`2`	`2`	`// "lpadmin" command for CUPS.`
`3`	`3`	`//`
`4`		`-// Copyright © 2021-2023 by OpenPrinting.`
	`4`	`+// Copyright © 2021-2025 by OpenPrinting.`
`5`	`5`	`// Copyright © 2007-2021 by Apple Inc.`
`6`	`6`	`// Copyright © 1997-2006 by Easy Software Products.`
`7`	`7`	`//`
`@@ -277,7 +277,7 @@ main(int argc, // I - Number of command-line arguments`
`277`	`277`	`case 'o' : // -o OPTION=VALUE`
`278`	`278`	`if (opt[1] != '\0')`
`279`	`279`	`{`
`280`		`- num_options = cupsParseOptions(opt + 1, num_options, &options);`
	`280`	`+ num_options = cupsParseOptions(opt + 1, /end/NULL, num_options, &options);`
`281`	`281`	`opt += strlen(opt) - 1;`
`282`	`282`	`}`
`283`	`283`	`else`
`@@ -290,7 +290,7 @@ main(int argc, // I - Number of command-line arguments`
`290`	`290`	`return (usage(stderr));`
`291`	`291`	`}`
`292`	`292`
`293`		`- num_options = cupsParseOptions(argv[i], num_options, &options);`
	`293`	`+ num_options = cupsParseOptions(argv[i], /end/NULL, num_options, &options);`
`294`	`294`	`}`
`295`	`295`	`break;`
`296`	`296`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`//`
`2`	`2`	`// "lpr" command for CUPS.`
`3`	`3`	`//`
`4`		`-// Copyright © 2021-2023 by OpenPrinting.`
	`4`	`+// Copyright © 2021-2025 by OpenPrinting.`
`5`	`5`	`// Copyright © 2007-2019 by Apple Inc.`
`6`	`6`	`// Copyright © 1997-2007 by Easy Software Products.`
`7`	`7`	`//`
`@@ -150,7 +150,7 @@ main(int argc, // I - Number of command-line arguments`
`150`	`150`	`case 'o' : // Option`
`151`	`151`	`if (opt[1] != '\0')`
`152`	`152`	`{`
`153`		`- num_options = cupsParseOptions(opt + 1, num_options, &options);`
	`153`	`+ num_options = cupsParseOptions(opt + 1, /end/NULL, num_options, &options);`
`154`	`154`	`opt += strlen(opt) - 1;`
`155`	`155`	`}`
`156`	`156`	`else`
`@@ -162,7 +162,7 @@ main(int argc, // I - Number of command-line arguments`
`162`	`162`	`usage();`
`163`	`163`	`}`
`164`	`164`
`165`		`- num_options = cupsParseOptions(argv[i], num_options, &options);`
	`165`	`+ num_options = cupsParseOptions(argv[i], /end/NULL, num_options, &options);`
`166`	`166`	`}`
`167`	`167`	`break;`
`168`	`168`