Rework blobstamper code. We do not need both size and end count. So leave only one (and it is end that will be left)

nataraj-hates-MS-for-stealing-github · nataraj-hates-MS-for-stealing-github · commit be561c5f75d1 · 2023-07-14T12:31:41.000+03:00
diff --git a/blobstamper/blob.cpp b/blobstamper/blob.cpp
@@ -27,9 +27,8 @@
 Blob::Blob (char * data_in, size_t size_in)
 {
     data = data_in;
-    size = size_in;
     begin = 0;
-    end = size -1; /* i.e. size=1 means begin=0 && end=0 */
+    end = size_in - 1; /* i.e. size=1 means begin=0 && end=0 */
 }
 
 bool
@@ -77,7 +76,7 @@ Blob::Chop(size_t min_size, size_t max_size)
 std::vector<char>
 Blob::AsByteVector()
 {
-    std::vector<char> res(data + begin, data + begin + size);
+    std::vector<char> res(data + begin, data + end + 1);
     return res;
 }
 
@@ -100,8 +99,6 @@ std::vector<char>
 Blob::asVector()
 {
   std::vector<char> res( (char *)data + begin, (char*)data + begin + Size());
-
-//  memcpy(&res[0], data + begin, Size());
   return res;
 }
 
diff --git a/blobstamper/blob.h b/blobstamper/blob.h
@@ -29,9 +29,8 @@ class StampBase;
 
 class Blob
 {
-    protected:
+    private:
         char*  data;
-        size_t    size;
         size_t    begin;
         size_t    end;
     public:
@@ -49,12 +48,12 @@ class Blob
         std::string asString(); /* Should not be used in prod, for tests and examples only*/
 };
 
-class OutOfData  /*An exeption. Experemental for now*/
+class OutOfData  /*An exception. Experimental for now*/
 {
 
 };
 
-class NotImplemented  /*An exeption */
+class NotImplemented  /*An exception */
 {
 
 };

Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,8 @@`
`27`	`27`	`Blob::Blob (char * data_in, size_t size_in)`
`28`	`28`	`{`
`29`	`29`	`data = data_in;`
`30`		`- size = size_in;`
`31`	`30`	`begin = 0;`
`32`		`- end = size -1; /* i.e. size=1 means begin=0 && end=0 */`
	`31`	`+ end = size_in - 1; /* i.e. size=1 means begin=0 && end=0 */`
`33`	`32`	`}`
`34`	`33`
`35`	`34`	`bool`
`@@ -77,7 +76,7 @@ Blob::Chop(size_t min_size, size_t max_size)`
`77`	`76`	`std::vector<char>`
`78`	`77`	`Blob::AsByteVector()`
`79`	`78`	`{`
`80`		`- std::vector<char> res(data + begin, data + begin + size);`
	`79`	`+ std::vector<char> res(data + begin, data + end + 1);`
`81`	`80`	`return res;`
`82`	`81`	`}`
`83`	`82`
`@@ -100,8 +99,6 @@ std::vector<char>`
`100`	`99`	`Blob::asVector()`
`101`	`100`	`{`
`102`	`101`	`std::vector<char> res( (char )data + begin, (char)data + begin + Size());`
`103`		`-`
`104`		`-// memcpy(&res[0], data + begin, Size());`
`105`	`102`	`return res;`
`106`	`103`	`}`
`107`	`104`