Apply changes to 1.4.x branch.

CHANGES.md

@@ -1,6 +1,14 @@
 Changes in PAPPL
 ================
 
+
+Changes in v1.4.1
+-----------------
+
+- Fixed typos in the names of the `papplJobResume` and `papplJobSuspend`
+  functions (Issue #295)
+
+
 Changes in v1.4.0
 -----------------
 

doc/pappl.html

@@ -279,8 +279,6 @@ <h2 class="title">Contents</h2>
 <li><a href="#the-self-test-page-callback">The Self-Test Page Callback</a></li>
 </ul></li>
 <li><a href="#FUNCTIONS">Functions</a><ul class="subcontents">
-<li><a href="#pappJobResume">pappJobResume</a></li>
-<li><a href="#pappJobSuspend">pappJobSuspend</a></li>
 <li><a href="#papplClientGetCSRFToken">papplClientGetCSRFToken</a></li>
 <li><a href="#papplClientGetCookie">papplClientGetCookie</a></li>
 <li><a href="#papplClientGetForm">papplClientGetForm</a></li>
@@ -369,13 +367,15 @@ <h2 class="title">Contents</h2>
 <li><a href="#papplJobIsCanceled">papplJobIsCanceled</a></li>
 <li><a href="#papplJobOpenFile">papplJobOpenFile</a></li>
 <li><a href="#papplJobRelease">papplJobRelease</a></li>
+<li><a href="#papplJobResume">papplJobResume</a></li>
 <li><a href="#papplJobRetain">papplJobRetain</a></li>
 <li><a href="#papplJobSetCopiesCompleted">papplJobSetCopiesCompleted</a></li>
 <li><a href="#papplJobSetData">papplJobSetData</a></li>
 <li><a href="#papplJobSetImpressions">papplJobSetImpressions</a></li>
 <li><a href="#papplJobSetImpressionsCompleted">papplJobSetImpressionsCompleted</a></li>
 <li><a href="#papplJobSetMessage">papplJobSetMessage</a></li>
 <li><a href="#papplJobSetReasons">papplJobSetReasons</a></li>
+<li><a href="#papplJobSuspend">papplJobSuspend</a></li>
 <li><a href="#papplLocFormatString">papplLocFormatString</a></li>
 <li><a href="#papplLocGetDefaultMediaSizeName">papplLocGetDefaultMediaSizeName</a></li>
 <li><a href="#papplLocGetString">papplLocGetString</a></li>
@@ -1479,28 +1479,6 @@ <h3 class="title" id="the-self-test-page-callback">The Self-Test Page Callback</
 </code></pre>
 <p>When the callback returns a filename (copied to the specified buffer), that file will be queued as a job for the printer. The callback can also try opening the device using the <a href="#papplPrinterOpenDevice"><code>papplPrinterOpenDevice</code></a> function to send a printer self-test command instead - in this case the callback must return <code>NULL</code> to indicate there is no file to be printed.</p>
 <h2 class="title"><a id="FUNCTIONS">Functions</a></h2>
-<h3 class="function"><a id="pappJobResume">pappJobResume</a></h3>
-<p class="description">Resume processing of a job.</p>
-<p class="code">
-void pappJobResume(<a href="#pappl_job_t">pappl_job_t</a> *job, <a href="#pappl_jreason_t">pappl_jreason_t</a> remove);</p>
-<h4 class="parameters">Parameters</h4>
-<table class="list"><tbody>
-<tr><th>job</th>
-<td class="description">Job</td></tr>
-<tr><th>remove</th>
-<td class="description">Reasons to remove from &quot;job-state-reasons&quot;</td></tr>
-</tbody></table>
-<h3 class="function"><a id="pappJobSuspend">pappJobSuspend</a></h3>
-<p class="description">Temporarily stop processing of a job.</p>
-<p class="code">
-void pappJobSuspend(<a href="#pappl_job_t">pappl_job_t</a> *job, <a href="#pappl_jreason_t">pappl_jreason_t</a> add);</p>
-<h4 class="parameters">Parameters</h4>
-<table class="list"><tbody>
-<tr><th>job</th>
-<td class="description">Job</td></tr>
-<tr><th>add</th>
-<td class="description">Reasons to add to &quot;job-state-reasons&quot;</td></tr>
-</tbody></table>
 <h3 class="function"><a id="papplClientGetCSRFToken">papplClientGetCSRFToken</a></h3>
 <p class="description">Get a unique Cross-Site Request Forgery token
                               string.</p>
@@ -3204,6 +3182,17 @@ <h4 class="returnvalue">Return Value</h4>
 <p class="description"><code>true</code> on success, <code>false</code> on failure</p>
 <h4 class="discussion">Discussion</h4>
 <p class="discussion">This function releases a held job for printing.</p>
+<h3 class="function"><a id="papplJobResume">papplJobResume</a></h3>
+<p class="description">Resume processing of a job.</p>
+<p class="code">
+void papplJobResume(<a href="#pappl_job_t">pappl_job_t</a> *job, <a href="#pappl_jreason_t">pappl_jreason_t</a> remove);</p>
+<h4 class="parameters">Parameters</h4>
+<table class="list"><tbody>
+<tr><th>job</th>
+<td class="description">Job</td></tr>
+<tr><th>remove</th>
+<td class="description">Reasons to remove from &quot;job-state-reasons&quot;</td></tr>
+</tbody></table>
 <h3 class="function"><a id="papplJobRetain">papplJobRetain</a></h3>
 <p class="description">Retain a completed job until the specified time.</p>
 <p class="code">
@@ -3316,6 +3305,17 @@ <h4 class="parameters">Parameters</h4>
 <h4 class="discussion">Discussion</h4>
 <p class="discussion">This function updates the job state reasons bitfield.  The &quot;remove&quot; bits
 are cleared first, then the &quot;add&quot; bits are set.</p>
+<h3 class="function"><a id="papplJobSuspend">papplJobSuspend</a></h3>
+<p class="description">Temporarily stop processing of a job.</p>
+<p class="code">
+void papplJobSuspend(<a href="#pappl_job_t">pappl_job_t</a> *job, <a href="#pappl_jreason_t">pappl_jreason_t</a> add);</p>
+<h4 class="parameters">Parameters</h4>
+<table class="list"><tbody>
+<tr><th>job</th>
+<td class="description">Job</td></tr>
+<tr><th>add</th>
+<td class="description">Reasons to add to &quot;job-state-reasons&quot;</td></tr>
+</tbody></table>
 <h3 class="function"><a id="papplLocFormatString">papplLocFormatString</a></h3>
 <p class="description">Format a localized string into a buffer.</p>
 <p class="code">

man/pappl-client.3

@@ -1,4 +1,4 @@
-.TH pappl-client 3 "pappl client functions" "2023-09-28" "pappl client functions"
+.TH pappl-client 3 "pappl client functions" "2023-10-06" "pappl client functions"
 .SH NAME
 pappl-client \- pappl client functions
 .SH LIBRARY

man/pappl-device.3

@@ -1,4 +1,4 @@
-.TH pappl-device 3 "pappl device functions" "2023-09-28" "pappl device functions"
+.TH pappl-device 3 "pappl device functions" "2023-10-06" "pappl device functions"
 .SH NAME
 pappl-device \- pappl device functions
 .SH LIBRARY

man/pappl-job.3

@@ -1,4 +1,4 @@
-.TH pappl-job 3 "pappl job functions" "2023-09-28" "pappl job functions"
+.TH pappl-job 3 "pappl job functions" "2023-10-06" "pappl job functions"
 .SH NAME
 pappl-job \- pappl job functions
 .SH LIBRARY
@@ -259,24 +259,6 @@ PAPPL_JREASON_WARNINGS_DETECTED
 .br
 \'warnings-detected'
 .SH FUNCTIONS
-.SS pappJobResume
-Resume processing of a job.
-.PP
-.nf
-void pappJobResume (
-    pappl_job_t *job,
-    pappl_jreason_t remove
-);
-.fi
-.SS pappJobSuspend
-Temporarily stop processing of a job.
-.PP
-.nf
-void pappJobSuspend (
-    pappl_job_t *job,
-    pappl_jreason_t add
-);
-.fi
 .SS papplJobCancel
 Cancel a job.
 .PP
@@ -630,6 +612,15 @@ bool  papplJobRelease (
 .fi
 .PP
 This function releases a held job for printing.
+.SS papplJobResume
+Resume processing of a job.
+.PP
+.nf
+void papplJobResume (
+    pappl_job_t *job,
+    pappl_jreason_t remove
+);
+.fi
 .SS papplJobRetain
 Retain a completed job until the specified time.
 .PP
@@ -721,6 +712,15 @@ void papplJobSetReasons (
 .PP
 This function updates the job state reasons bitfield.  The "remove" bits
 are cleared first, then the "add" bits are set.
+.SS papplJobSuspend
+Temporarily stop processing of a job.
+.PP
+.nf
+void papplJobSuspend (
+    pappl_job_t *job,
+    pappl_jreason_t add
+);
+.fi
 .SS papplPrinterFindJob
 Find a job.
 .PP

man/pappl-log.3

@@ -1,4 +1,4 @@
-.TH pappl-log 3 "pappl logging functions" "2023-09-28" "pappl logging functions"
+.TH pappl-log 3 "pappl logging functions" "2023-10-06" "pappl logging functions"
 .SH NAME
 pappl-log \- pappl logging functions
 .SH LIBRARY

man/pappl-mainloop.3

@@ -1,4 +1,4 @@
-.TH pappl-mainloop 3 "pappl main loop functions" "2023-09-28" "pappl main loop functions"
+.TH pappl-mainloop 3 "pappl main loop functions" "2023-10-06" "pappl main loop functions"
 .SH NAME
 pappl-mainloop \- pappl main loop functions
 .SH LIBRARY

man/pappl-printer.3

@@ -1,4 +1,4 @@
-.TH pappl-printer 3 "pappl printer functions" "2023-09-28" "pappl printer functions"
+.TH pappl-printer 3 "pappl printer functions" "2023-10-06" "pappl printer functions"
 .SH NAME
 pappl-printer \- pappl printer functions
 .SH LIBRARY

man/pappl-resource.3

@@ -1,4 +1,4 @@
-.TH pappl-resource 3 "pappl resource functions" "2023-09-28" "pappl resource functions"
+.TH pappl-resource 3 "pappl resource functions" "2023-10-06" "pappl resource functions"
 .SH NAME
 pappl-resource \- pappl resource functions
 .SH LIBRARY

man/pappl-system.3

@@ -1,4 +1,4 @@
-.TH pappl-system 3 "pappl system functions" "2023-09-28" "pappl system functions"
+.TH pappl-system 3 "pappl system functions" "2023-10-06" "pappl system functions"
 .SH NAME
 pappl-system \- pappl system functions
 .SH LIBRARY

pappl/job-process.c

@@ -876,11 +876,11 @@ _papplJobProcessRaster(
 
 
 //
-// 'pappJobResume()' - Resume processing of a job.
+// 'papplJobResume()' - Resume processing of a job.
 //
 
 void
-pappJobResume(pappl_job_t     *job,	// I - Job
+papplJobResume(pappl_job_t     *job,	// I - Job
               pappl_jreason_t remove)	// I - Reasons to remove from "job-state-reasons"
 {
   // Range check input...
@@ -903,11 +903,11 @@ pappJobResume(pappl_job_t     *job,	// I - Job
 
 
 //
-// 'pappJobSuspend()' - Temporarily stop processing of a job.
+// 'papplJobSuspend()' - Temporarily stop processing of a job.
 //
 
 void
-pappJobSuspend(pappl_job_t     *job,	// I - Job
+papplJobSuspend(pappl_job_t     *job,	// I - Job
                pappl_jreason_t add)	// I - Reasons to add to "job-state-reasons"
 {
   // Range check input...

pappl/job.h

@@ -91,7 +91,7 @@ extern bool		papplJobIsCanceled(pappl_job_t *job) _PAPPL_PUBLIC;
 extern int		papplJobOpenFile(pappl_job_t *job, char *fname, size_t fnamesize, const char *directory, const char *ext, const char *mode) _PAPPL_PUBLIC;
 
 extern bool		papplJobRelease(pappl_job_t *job, const char *username) _PAPPL_PUBLIC;
-extern void		pappJobResume(pappl_job_t *job, pappl_jreason_t remove) _PAPPL_PUBLIC;
+extern void		papplJobResume(pappl_job_t *job, pappl_jreason_t remove) _PAPPL_PUBLIC;
 extern bool		papplJobRetain(pappl_job_t *job, const char *username, const char *until, int until_interval, time_t until_time) _PAPPL_PUBLIC;
 
 extern void		papplJobSetCopiesCompleted(pappl_job_t *job, int add) _PAPPL_PUBLIC;
@@ -100,7 +100,7 @@ extern void		papplJobSetImpressions(pappl_job_t *job, int impressions) _PAPPL_PU
 extern void		papplJobSetImpressionsCompleted(pappl_job_t *job, int add) _PAPPL_PUBLIC;
 extern void		papplJobSetMessage(pappl_job_t *job, const char *message, ...) _PAPPL_PUBLIC _PAPPL_FORMAT(2,3);
 extern void		papplJobSetReasons(pappl_job_t *job, pappl_jreason_t add, pappl_jreason_t remove) _PAPPL_PUBLIC;
-extern void		pappJobSuspend(pappl_job_t *job, pappl_jreason_t add) _PAPPL_PUBLIC;
+extern void		papplJobSuspend(pappl_job_t *job, pappl_jreason_t add) _PAPPL_PUBLIC;
 
 
 #  ifdef __cplusplus

pappl/libpappl1.def

@@ -56,6 +56,8 @@ papplDeviceParseID
 papplDevicePrintf
 papplDevicePuts
 papplDeviceRead
+papplDeviceRemoveScheme
+papplDeviceRemoveTypes
 papplDeviceSetData
 papplDeviceWrite
 papplGetRand
@@ -66,6 +68,8 @@ papplJobCreateWithFile
 papplJobDeletePrintOptions
 papplJobFilterImage
 papplJobGetAttribute
+papplJobGetCopies
+papplJobGetCopiesCompleted
 papplJobGetData
 papplJobGetFilename
 papplJobGetFormat
@@ -85,12 +89,15 @@ papplJobHold
 papplJobIsCanceled
 papplJobOpenFile
 papplJobRelease
+papplJobResume
 papplJobRetain
+papplJobSetCopiesCompleted
 papplJobSetData
 papplJobSetImpressions
 papplJobSetImpressionsCompleted
 papplJobSetMessage
 papplJobSetReasons
+papplJobSuspend
 papplLocFormatString
 papplLocGetDefaultMediaSizeName
 papplLocGetString

pappl/system-ipp.c

@@ -640,7 +640,7 @@ ipp_find_drivers(
 {
   http_status_t	auth_status;		// Authorization status
   const char	*device_id;		// Device ID
-  int		num_dids = 0;		// Number of key/value pairs
+  cups_len_t	num_dids = 0;		// Number of key/value pairs
   cups_option_t	*dids = NULL;		// Device ID key/value pairs
   const char	*driver_name = NULL,	// Matching driver name, if any
 		*cmd = NULL,		// Command set from device ID
@@ -703,7 +703,7 @@ ipp_find_drivers(
     else if (num_dids > 0)
     {
       // Compare device ID values...
-      int		num_dids2;	// Number of device ID key/value pairs
+      cups_len_t	num_dids2;	// Number of device ID key/value pairs
       cups_option_t	*dids2;		// Device ID key/value pairs
       const char	*cmd2,		// Command set from device ID
 			*make2,		// Make from device ID

vcnet/copy-dlls.bat

@@ -1,5 +1,5 @@
 :: Script to copy dependent DLLs to the named build directory
-copy packages\libcups2_native.redist.2.4.3.4\build\native\bin\x64\Debug\*.dll %1
+copy packages\libcups2_native.redist.2.4.7\build\native\bin\x64\Debug\*.dll %1
 copy packages\libjpeg-turbo-v142.2.0.4.3\build\native\bin\x64\v142\Debug\*.dll %1
 copy packages\libressl_native.redist.3.7.3\build\native\bin\x64\Debug\*.dll %1
 copy packages\libpng_native.redist.1.6.30\build\native\bin\x64\Debug\*.dll %1

vcnet/libpappl1.vcxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="packages\libcups2_native.2.4.3.4\build\native\libcups2_native.props" Condition="Exists('packages\libcups2_native.2.4.3.4\build\native\libcups2_native.props')" />
+  <Import Project="packages\libcups2_native.2.4.7\build\native\libcups2_native.props" Condition="Exists('packages\libcups2_native.2.4.7\build\native\libcups2_native.props')" />
   <Import Project="packages\libjpeg-turbo-v142.2.0.4.3\build\native\libjpeg-turbo-v142.props" Condition="Exists('packages\libjpeg-turbo-v142.2.0.4.3\build\nativelinjpeg-turbo-v142.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug-Messages|x64">
@@ -88,7 +88,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>packages\libcups2_native.2.4.3.4\build\native\lib\x64\Debug\libcups2.lib;packages\libressl_native.3.7.3\build\native\lib\x64\Release\ssl.lib;packages\libressl_native.3.7.3\build\native\lib\x64\Release\crypto.lib;packages\libpng_native.1.6.30\build\native\lib\x64\Debug\libpng16d.lib;packages\libjpeg-turbo-v142.2.0.4.3\build\native\lib\x64\v142\Debug\jpeg.lib;ws2_32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>packages\libcups2_native.2.4.7\build\native\lib\x64\Debug\libcups2.lib;packages\libressl_native.3.7.3\build\native\lib\x64\Release\ssl.lib;packages\libressl_native.3.7.3\build\native\lib\x64\Release\crypto.lib;packages\libpng_native.1.6.30\build\native\lib\x64\Debug\libpng16d.lib;packages\libjpeg-turbo-v142.2.0.4.3\build\native\lib\x64\v142\Debug\jpeg.lib;ws2_32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)libpappl1.dll</OutputFile>
       <ModuleDefinitionFile>..\pappl\libpappl1.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -115,7 +115,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>packages\libcups2_native.2.4.3.4\build\native\lib\x64\Debug\libcups2.lib;packages\libressl_native.3.7.3\build\native\lib\x64\Release\ssl.lib;packages\libressl_native.3.7.3\build\native\lib\x64\Release\crypto.lib;packages\libpng_native.1.6.30\build\native\lib\x64\Debug\libpng16d.lib;packages\libjpeg-turbo-v142.2.0.4.3\build\native\lib\x64\v142\Debug\jpeg.lib;ws2_32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>packages\libcups2_native.2.4.7\build\native\lib\x64\Debug\libcups2.lib;packages\libressl_native.3.7.3\build\native\lib\x64\Release\ssl.lib;packages\libressl_native.3.7.3\build\native\lib\x64\Release\crypto.lib;packages\libpng_native.1.6.30\build\native\lib\x64\Debug\libpng16d.lib;packages\libjpeg-turbo-v142.2.0.4.3\build\native\lib\x64\v142\Debug\jpeg.lib;ws2_32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)libpappl1.dll</OutputFile>
       <ModuleDefinitionFile>..\pappl\libpappl1.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -139,7 +139,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>packages\libcups2_native.2.4.3.4\build\native\lib\x64\Release\libcups2.lib;packages\libressl_native.3.7.3\build\native\lib\x64\Release\ssl.lib;packages\libressl_native.3.7.3\build\native\lib\x64\Release\crypto.lib;packages\libpng_native.1.6.30\build\native\lib\x64\Release\libpng16.lib;packages\libjpeg-turbo-v142.2.0.4.3\build\native\lib\x64\v142\Release\jpeg.lib;ws2_32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>packages\libcups2_native.2.4.7\build\native\lib\x64\Release\libcups2.lib;packages\libressl_native.3.7.3\build\native\lib\x64\Release\ssl.lib;packages\libressl_native.3.7.3\build\native\lib\x64\Release\crypto.lib;packages\libpng_native.1.6.30\build\native\lib\x64\Release\libpng16.lib;packages\libjpeg-turbo-v142.2.0.4.3\build\native\lib\x64\v142\Release\jpeg.lib;ws2_32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)libpappl1.dll</OutputFile>
       <ModuleDefinitionFile>..\pappl\libpappl1.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -252,6 +252,6 @@
     </PropertyGroup>
     <Error Condition="!Exists('packages\zlib_native.redist.1.2.11\build\native\zlib_native.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\zlib_native.redist.1.2.11\build\native\zlib_native.redist.targets'))" />
     <Error Condition="!Exists('packages\zlib_native.1.2.11\build\native\zlib_native.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\zlib_native.1.2.11\build\native\zlib_native.targets'))" />
-    <Error Condition="!Exists('packages\libcups2_native.2.4.3.4\build\native\libcups2_native.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\libcups2_native.2.4.3.4\build\native\libcups2_native.props'))" />
+    <Error Condition="!Exists('packages\libcups2_native.2.4.7\build\native\libcups2_native.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\libcups2_native.2.4.7\build\native\libcups2_native.props'))" />
   </Target>
 </Project>

vcnet/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="libcups2_native" version="2.4.3.4" targetFramework="native" />
-  <package id="libcups2_native.redist" version="2.4.3.4" targetFramework="native" />
+  <package id="libcups2_native" version="2.4.7" targetFramework="native" />
+  <package id="libcups2_native.redist" version="2.4.7" targetFramework="native" />
   <package id="libjpeg-turbo-v142" version="2.0.4.3" targetFramework="native" />
   <package id="libpng_native" version="1.6.30" targetFramework="native" />
   <package id="libpng_native.redist" version="1.6.30" targetFramework="native" />