Sync up with libcups changes.

istopwg · Sep 20, 2024 · c6c6d07 · c6c6d07
1 parent 3403eea
commit c6c6d07
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/libcups b/libcups
diff --git a/server/transform.c b/server/transform.c
@@ -579,7 +579,7 @@ process_attr_message(
 
   serverLogJob(SERVER_LOGLEVEL_DEBUG, job, "%s", message);
 
-  num_options = cupsParseOptions(message + 5, num_options, &options);
+  num_options = cupsParseOptions(message + 5, /*end*/NULL, num_options, &options);
 
   serverLogJob(SERVER_LOGLEVEL_DEBUG, job, "num_options=%u", (unsigned)num_options);
 

diff --git a/tools/ipp3dprinter.c b/tools/ipp3dprinter.c
@@ -3461,7 +3461,7 @@ process_attr_message(
   * Grab attributes from the message line...
   */
 
-  num_options = cupsParseOptions(message + 5, num_options, &options);
+  num_options = cupsParseOptions(message + 5, /*end*/NULL, num_options, &options);
 
  /*
   * Loop through the options and record them in the printer or job objects...

diff --git a/tools/ippdoclint.c b/tools/ippdoclint.c
@@ -132,7 +132,7 @@ main(int  argc,				/* I - Number of command-line arguments */
 	      if (i >= argc)
 	        usage(1);
 
-	      num_options = cupsParseOptions(argv[i], num_options, &options);
+	      num_options = cupsParseOptions(argv[i], /*end*/NULL, num_options, &options);
 	      break;
 
 	  case 'v' : /* Be verbose... */

diff --git a/tools/ipptransform3d.c b/tools/ipptransform3d.c
@@ -156,7 +156,7 @@ main(int  argc,				/* I - Number of command-line args */
 	      if (i >= argc)
 	        usage(1);
 
-	      num_options = cupsParseOptions(argv[i], num_options, &options);
+	      num_options = cupsParseOptions(argv[i], /*end*/NULL, num_options, &options);
 	      break;
 
 	  case 'v' : /* Be verbose... */
+1 −0		.gitignore
+6 −0		CHANGES.md
+34 −0		README.md
+5 −11		cups/Makefile
+5 −2		cups/cups-private.h
+1 −1		cups/cups.h
+21 −2		cups/dest-localization.c
+7 −3		cups/dest-options.c
+1 −1		cups/dest.c
+2 −2		cups/encode.c
+35 −14		cups/file.c
+22 −3		cups/getputfile.c
+3 −3		cups/http-addr.c
+118 −6		cups/http.c
+1 −0		cups/http.h
+7 −6		cups/ipp.c
+1 −1		cups/ipp.h
+17 −33		cups/json.c
+102 −52		cups/jwt.c
+1 −1		cups/jwt.h
+8 −5		cups/langprintf.c
+7 −5		cups/libcups3.def
+479 −174		cups/oauth.c
+12 −5		cups/oauth.h
+20 −13		cups/options.c
+28 −18		cups/pwg-media.c
+23 −16		cups/pwg-private.h
+44 −10		cups/raster-stream.c
+13 −9		cups/request.c
+2 −2		cups/testdest.c
+4 −1		cups/testdnssd.c
+1 −1		cups/testform.c
+307 −126		cups/testipp.c
+31 −0		cups/testipp.test
+64 −3		cups/testjwt.c
+67 −243		cups/testlang.c
+476 −2		cups/testoauth.c
+2 −2		cups/testoptions.c
+82 −288		cups/testtestpage.c
+1 −1		cups/tls-openssl.c
+2 −0		cups/tls.c
+ −		doc/cupspm.epub
+171 −44		doc/cupspm.html
+18 −2		examples/Makefile
+351 −263		examples/ipp-1.1.test
+123 −60		examples/ipp-2.0.test
+203 −0		examples/ipp-2.1.test
+222 −0		examples/ipp-2.2.test
+1,412 −0		examples/pwg5100.1.test
+94 −0		examples/pwg5100.11.test
+1,327 −0		examples/pwg5100.2.test
+171 −0		examples/pwg5100.3.test
+321 −0		examples/pwg5100.5.test
+288 −0		examples/pwg5100.6.test
+1,694 −0		examples/pwg5100.7.test
+119 −0		examples/pwg5100.8.test
+35 −0		examples/pwg5100.9.test
+34 −0		examples/pwg5101.1.test
+71 −0		examples/rfc3380.test
+114 −0		examples/rfc3995-3996.test
+72 −0		examples/rfc3998.test
+29 −0		examples/validate-resources.test
+18 −3		man/ipptool.1
+6 −3		man/ipptoolfile.5
+2 −2		tools/Makefile
+66 −34		tools/ipp-options.c
+0 −8		tools/ipp-options.h
+7 −6		tools/ippeveprinter.c
+168 −31		tools/ipptool.c
+2 −2		tools/ipptransform.c
+12 −1		tools/test.conf
+8 −6		vcnet/libcups3.vcxproj
+0 −2		xcode/libcups.xcodeproj/project.pbxproj