OpenSystemsDevelopment / qpdf

Commit 9ff713f4b921669bf4e1e348ad1af03613e0aca8

Authored by m-holger
1 parent 30bc392a

Refactor `Buffer::Members`: replace `unsigned char*` with `char*`, simplify stri… 

…ng handling, and reduce reliance on `reinterpret_cast`.
Inline Side-by-side
Showing 1 changed file with 8 additions and 8 deletions
libqpdf/Buffer.cc
  View file @9ff713f
... ... @@ -11,7 +11,7 @@ class Buffer::Members
11 11 public:
12 12 Members() = default;
13 13 // Constructor for Buffers that don't own the memory.
14   - Members(size_t size, unsigned char* buf) :
  14 + Members(size_t size, char* buf) :
15 15 size(size),
16 16 buf(buf)
17 17 {
... ... @@ -19,7 +19,7 @@ class Buffer::Members
19 19 Members(std::string&& content) :
20 20 str(std::move(content)),
21 21 size(str.size()),
22   - buf(reinterpret_cast<unsigned char*>(str.data()))
  22 + buf(str.data())
23 23 {
24 24 }
25 25 Members(Members const&) = delete;
... ... @@ -28,7 +28,7 @@ class Buffer::Members
28 28 private:
29 29 std::string str;
30 30 size_t size;
31   - unsigned char* buf;
  31 + char* buf;
32 32 };
33 33  
34 34 Buffer::Buffer() :
... ... @@ -47,12 +47,12 @@ Buffer::Buffer(std::string&amp;&amp; content) :
47 47 }
48 48  
49 49 Buffer::Buffer(unsigned char* buf, size_t size) :
50   - m(std::make_unique<Members>(size, buf))
  50 + m(std::make_unique<Members>(size, reinterpret_cast<char*>(buf)))
51 51 {
52 52 }
53 53  
54 54 Buffer::Buffer(std::string& content) :
55   - m(std::make_unique<Members>(content.size(), reinterpret_cast<unsigned char*>(content.data())))
  55 + m(std::make_unique<Members>(content.size(), content.data()))
56 56 {
57 57 }
58 58  
... ... @@ -79,13 +79,13 @@ Buffer::getSize() const
79 79 unsigned char const*
80 80 Buffer::getBuffer() const
81 81 {
82   - return m->buf;
  82 + return reinterpret_cast<unsigned char*>(m->buf);
83 83 }
84 84  
85 85 unsigned char*
86 86 Buffer::getBuffer()
87 87 {
88   - return m->buf;
  88 + return reinterpret_cast<unsigned char*>(m->buf);
89 89 }
90 90  
91 91 Buffer
... ... @@ -94,5 +94,5 @@ Buffer::copy() const
94 94 if (m->size == 0) {
95 95 return {};
96 96 }
97   - return {std::string(reinterpret_cast<char const*>(m->buf), m->size)};
  97 + return {std::string(m->buf, m->size)};
98 98 }
... ...