Commit7be5616

committed

Move most of the GalleySereies extract code to the separate function, so we can use it both for binary and string stamps

1 parent3171b32 commit7be5616Copy full SHA for 7be5616

File tree

+19

-4

lines changed

+19

-4

lines changed

Lines changed: 18 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,28 @@ std::list<std::string>`
`12`	`12`	`GalleySeries::Extract(Blob &blob)`
`13`	`13`	`{`
`14`	`14`	`std::list<std::string> res;`
	`15`	`+ std::list<Blob> blobs =extract_internal(blob);`
	`16`	`+for(Blob blob : blobs)`
	`17`	`+ {`
	`18`	`+ std::string str= blob.ShiftSingleStampStr(stamp);`
	`19`	`+ res.push_back(str);`
	`20`	`+ }`
	`21`	`+return res;`
	`22`	`+}`
	`23`	`+`
	`24`	`+`
	`25`	`+std::list<Blob>`
	`26`	`+GalleySeries::extract_internal(Blob &blob)`
	`27`	`+{`
	`28`	`+ std::list<Blob> res;`
`15`	`29`
`16`	`30`	`if (stamp.isFixedSize())`
`17`	`31`	`{`
	`32`	`+int size = stamp.minSize();`
`18`	`33`	`while (1)`
`19`	`34`	`{`
`20`		`-std::string el = blob.ShiftSingleStampStr(stamp);`
`21`		`-if (el.empty())`
	`35`	`+Blob el = blob.ShiftBytes(size);`
	`36`	`+if (el.isEmpty())`
`22`	`37`	`break;`
`23`	`38`	`res.push_back(el);`
`24`	`39`	`}`
`@@ -77,8 +92,7 @@ GalleySeries::Extract(Blob &blob)`
`77`	`92`	`remainder = el_size_f - el_size;`
`78`	`93`
`79`	`94`	`Blob blob2 = blob.ShiftBytes(el_size);`
`80`		`- std::string str = blob2.ShiftSingleStampStr(stamp);`
`81`		`- res.push_back(str);`
	`95`	`+ res.push_back(blob2);`
`82`	`96`	`}`
`83`	`97`	`free(count_oracle);`
`84`	`98`	`}`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ class GalleySeries : public GalleyBase`
`25`	`25`	`StampGeneric &stamp;`
`26`	`26`	`public:`
`27`	`27`	`GalleySeries(StampGeneric & stamp_arg) : stamp(stamp_arg) {};`
	`28`	`+ std::list<Blob>extract_internal(Blob &blob);`
`28`	`29`	`std::list<std::string>Extract(Blob &blob);`
`29`	`30`	`intminSize()override;`
`30`	`31`	`intmaxSize()override {return -1;};/* Sereies always takes as much data as it can take*/`

Comments

(0)