ABI change: fix use of off_t, size_t, and integer types

Significantly improve the code's use of off_t for file offsets, size_t
for memory sizes, and integer types in cases where there has to be
compatibility with external interfaces.  Rework sections of the code
that would have prevented qpdf from working on files larger than 2 (or
maybe 4) GB in size.

1 files changed, 6 insertions, 5 deletions

diff --git a/include/qpdf/Buffer.hh b/include/qpdf/Buffer.hh
index 31db93e2..234d6ec0 100644
--- a/include/qpdf/Buffer.hh
+++ b/include/qpdf/Buffer.hh
@@ -9,6 +9,7 @@
 #define __BUFFER_HH__
 
 #include <qpdf/DLL.h>
+#include <cstring>              // for size_t
 
 class Buffer
 {
@@ -19,12 +20,12 @@ class Buffer
     // Create a Buffer object whose memory is owned by the class and
     // will be freed when the Buffer object is destroyed.
     QPDF_DLL
-    Buffer(unsigned long size);
+    Buffer(size_t size);
 
     // Create a Buffer object whose memory is owned by the caller and
     // will not be freed when the Buffer is destroyed.
     QPDF_DLL
-    Buffer(unsigned char* buf, unsigned long size);
+    Buffer(unsigned char* buf, size_t size);
 
     QPDF_DLL
     Buffer(Buffer const&);
@@ -33,19 +34,19 @@ class Buffer
     QPDF_DLL
     ~Buffer();
     QPDF_DLL
-    unsigned long getSize() const;
+    size_t getSize() const;
     QPDF_DLL
     unsigned char const* getBuffer() const;
     QPDF_DLL
     unsigned char* getBuffer();
 
   private:
-    void init(unsigned long size, unsigned char* buf, bool own_memory);
+    void init(size_t size, unsigned char* buf, bool own_memory);
     void copy(Buffer const&);
     void destroy();
 
     bool own_memory;
-    unsigned long size;
+    size_t size;
     unsigned char* buf;
 };