qgis · Apr 10, 2023
diff --git a/‎src/plugins/grass/qtermwidget/BlockArray.cpp
Lines changed: 14 additions & 15 deletions b/‎src/plugins/grass/qtermwidget/BlockArray.cpp
Lines changed: 14 additions & 15 deletions
diff --git a/‎src/plugins/grass/qtermwidget/BlockArray.h
Lines changed: 10 additions & 6 deletions b/‎src/plugins/grass/qtermwidget/BlockArray.h
Lines changed: 10 additions & 6 deletions
@@ -27,11 +27,10 @@
 #include "BlockArray.h"
 
 // System
-#include <assert.h>
 #include <sys/mman.h>
 #include <sys/param.h>
 #include <unistd.h>
-#include <stdio.h>
+#include <cstdio>
 
 
 using namespace Konsole;
@@ -42,9 +41,9 @@ BlockArray::BlockArray()
         : size(0),
         current(size_t(-1)),
         index(size_t(-1)),
-        lastmap(0),
+        lastmap(nullptr),
         lastmap_index(size_t(-1)),
-        lastblock(0), ion(-1),
+        lastblock(nullptr), ion(-1),
         length(0)
 {
     // lastmap_index = index = current = size_t(-1);
@@ -57,7 +56,7 @@ BlockArray::BlockArray()
 BlockArray::~BlockArray()
 {
     setHistorySize(0);
-    assert(!lastblock);
+    Q_ASSERT(!lastblock);
 }
 
 size_t BlockArray::append(Block * block)
@@ -139,7 +138,7 @@ const Block * BlockArray::at(size_t i)
 
     if (i > index) {
         qDebug() << "BlockArray::at() i > index\n";
-        return 0;
+        return nullptr;
     }
 
 //     if (index - i >= length) {
@@ -149,14 +148,14 @@ const Block * BlockArray::at(size_t i)
 
     size_t j = i; // (current - (index - i) + (index/size+1)*size) % size ;
 
-    assert(j < size);
+    Q_ASSERT(j < size);
     unmap();
 
-    Block * block = (Block *)mmap(0, blocksize, PROT_READ, MAP_PRIVATE, ion, j * blocksize);
+    Block * block = (Block *)mmap(nullptr, blocksize, PROT_READ, MAP_PRIVATE, ion, j * blocksize);
 
     if (block == (Block *)-1) {
         perror("mmap");
-        return 0;
+        return nullptr;
     }
 
     lastmap = block;
@@ -173,7 +172,7 @@ void BlockArray::unmap()
             perror("munmap");
         }
     }
-    lastmap = 0;
+    lastmap = nullptr;
     lastmap_index = size_t(-1);
 }
 
@@ -194,7 +193,7 @@ bool BlockArray::setHistorySize(size_t newsize)
 
     if (!newsize) {
         delete lastblock;
-        lastblock = 0;
+        lastblock = nullptr;
         if (ion >= 0) {
             close(ion);
         }
@@ -218,7 +217,7 @@ bool BlockArray::setHistorySize(size_t newsize)
             return false;
         }
 
-        assert(!lastblock);
+        Q_ASSERT(!lastblock);
 
         lastblock = new Block();
         size = newsize;
@@ -231,7 +230,7 @@ bool BlockArray::setHistorySize(size_t newsize)
         return false;
     } else {
         decreaseBuffer(newsize);
-        (void) ftruncate(ion, length*blocksize);
+        ftruncate(ion, length*blocksize);
         size = newsize;
 
         return true;
@@ -272,7 +271,7 @@ void BlockArray::decreaseBuffer(size_t newsize)
         return;
     }
 
-    // The Block constructor could do somthing in future...
+    // The Block constructor could do something in future...
     char * buffer1 = new char[blocksize];
 
     FILE * fion = fdopen(dup(ion), "w+b");
@@ -320,7 +319,7 @@ void BlockArray::increaseBuffer()
         return;
     }
 
-    // The Block constructor could do somthing in future...
+    // The Block constructor could do something in future...
     char * buffer1 = new char[blocksize];
     char * buffer2 = new char[blocksize];
 
 
@@ -27,16 +27,20 @@
 
 //#error Do not use in KDE 2.1
 
-#define BlockSize (1 << 12)
-#define ENTRIES   ((BlockSize - sizeof(size_t) ))
+#define QTERMWIDGET_BLOCKSIZE (1 << 12)
+#define ENTRIES   ((QTERMWIDGET_BLOCKSIZE - sizeof(size_t) ) / sizeof(unsigned char))
 
 namespace Konsole {
 
 struct Block {
-    unsigned char data[ENTRIES] = {};
-    size_t size = 0;
+    Block() {
+        size = 0;
+    }
+    unsigned char data[ENTRIES];
+    size_t size;
 };
 
+// ///////////////////////////////////////////////////////
 
 class BlockArray {
 public:
@@ -55,7 +59,7 @@ class BlockArray {
     * adds the Block at the end of history.
     * This may drop other blocks.
     *
-    * The ownership on the block is transfered.
+    * The ownership on the block is transferred.
     * An unique index number is returned for accessing
     * it later (if not yet dropped then)
     *
@@ -69,7 +73,7 @@ class BlockArray {
     * 0 if the block isn't available any more.
     *
     * The returned block is strictly readonly as only
-    * maped in memory - and will be invalid on the next
+    * mapped in memory - and will be invalid on the next
     * operation on this class.
     */
     const Block * at(size_t index);