libmythbase/http: only #define HTTP_CHUNKSIZE once

and use INT64_C() for type to eliminate casts. cstddef is for size_t.
MythTV · Mar 23, 2022 · c7baf5d · c7baf5d
1 parent 8435269
commit c7baf5d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/mythtv/libs/libmythbase/http/mythhttpcommon.h b/mythtv/libs/libmythbase/http/mythhttpcommon.h
@@ -9,11 +9,13 @@
 #include "mythbaseexp.h"
 
 // Std
+#include <cstddef>
+#include <cstdint>
 #include <memory>
 
 /// A group of functions shared between HTTP and WebSocket code.
 
-#define HTTP_CHUNKSIZE 65536L // 64k
+#define HTTP_CHUNKSIZE INT64_C(65536) // 64k
 
 #define JSONRPC  QStringLiteral("jsonrpc")
 #define XMLRPC   QStringLiteral("xmlrpc")

diff --git a/mythtv/libs/libmythbase/http/mythhttpparser.cpp b/mythtv/libs/libmythbase/http/mythhttpparser.cpp
@@ -131,7 +131,7 @@ bool MythHTTPParser::Read(QTcpSocket* Socket, bool& Ready)
     {
         int64_t want = m_contentLength - m_content->size();
         int64_t have = Socket->bytesAvailable();
-        m_content->append(Socket->read(qMax(want, qMax(static_cast<int64_t>(HTTP_CHUNKSIZE), have))));
+        m_content->append(Socket->read(qMax(want, qMax(HTTP_CHUNKSIZE, have))));
     }
 
     // Need more data...

diff --git a/mythtv/libs/libmythbase/http/mythhttpparser.h b/mythtv/libs/libmythbase/http/mythhttpparser.h
@@ -6,8 +6,6 @@
 
 class QTcpSocket;
 
-#define HTTP_CHUNKSIZE 65536L  // 64k
-
 class MythHTTPParser
 {
   public: