Commitbf3f011

committed

Move shifting N bytes from blob to Blob method

1 parente6668a6 commitbf3f011Copy full SHA for bf3f011

File tree

+30

-9

lines changed

+30

-9

lines changed

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -87,20 +87,20 @@ Blob::Dump()`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`Blob`
`90`		`-wflShiftN(Blob &blob,size_t n)`
	`90`	`+Blob::ShiftBytes(size_t n)`
`91`	`91`	`{`
`92`		`-if (blob.begin + n >blob.end)`
	`92`	`+if (begin + n > end)`
`93`	`93`	`{`
`94`	`94`	`Blobempty(NULL, -1);`
`95`		`-return empty;/not enough data/`
	`95`	`+return empty;/not enough data/`
`96`	`96`	`}`
`97`	`97`
`98`		`- Blobnew_blob(blob.data,blob.size);`
	`98`	`+ Blobnew_blob(data, size);`
`99`	`99`
`100`		`- new_blob.begin =blob.begin;`
`101`		`- new_blob.end =blob.begin + n -1;`
	`100`	`+ new_blob.begin = begin;/* FIXME this should go private once*/`
	`101`	`+ new_blob.end = begin + n -1;`
`102`	`102`
`103`		`-blob.begin += n;`
	`103`	`+ begin += n;`
`104`	`104`
`105`	`105`	`return new_blob;`
`106`	`106`	`}`
`@@ -114,7 +114,7 @@ wflShiftDouble(Blob &blob)`
`114`	`114`	`std::string res;`
`115`	`115`
`116`	`116`
`117`		`- Blob b2 =wflShiftN(blob,sizeof(double));`
	`117`	`+ Blob b2 = blob.ShiftBytes(sizeof(double));`
`118`	`118`	`if (b2.isEmpty())return"";`
`119`	`119`
`120`	`120`	`d = (double )( (char)b2.data + b2.begin);`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,12 @@ class Blob`
`7`	`7`	`Blob(char * data,int size);`
`8`	`8`	`boolisEmpty ();`
`9`	`9`	`voidDump();`
	`10`	`+ BlobShiftBytes(size_t n);`
`10`	`11`
`11`	`12`	`char * data;/FIXME потом сделать private/`
`12`	`13`	`int size;`
`13`	`14`	`int begin;`
`14`	`15`	`int end;`
`15`		`-`
`16`	`16`	`};`
`17`	`17`
`18`	`18`	`BlobwflShiftN(Blob &blob,size_t n);`

Lines changed: 21 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,29 @@ int`
`8`	`8`	`main(void)`
`9`	`9`	`{`
`10`	`10`	`Blobbl(my_data,strlen(my_data));`
	`11`	`+`
	`12`	`+printf("Original blob:\n");`
	`13`	`+`
`11`	`14`	`bl.Dump();`
`12`	`15`
	`16`	`+printf("\n Now shifting 3 bytes.\n");`
	`17`	`+ Blob bl2 = bl.ShiftBytes(3);`
	`18`	`+`
	`19`	`+printf("Bytes shifted:\n");`
	`20`	`+ bl2.Dump();`
	`21`	`+`
	`22`	`+printf("\n Remaining blob:\n");`
	`23`	`+ bl.Dump();`
	`24`	`+`
	`25`	`+printf("\n Now shifting too many bytes.\n");`
	`26`	`+`
	`27`	`+ Blob bl3 = bl.ShiftBytes(99999);`
	`28`	`+`
	`29`	`+if (bl3.isEmpty())`
	`30`	`+printf("Got empty result. All is right\n");`
	`31`	`+else`
	`32`	`+printf("got non-empty result. SOMETHING IS REALLY WRONG!!!!\n");`
	`33`	`+`
`13`	`34`
`14`	`35`	`return0;`
`15`	`36`	`}`

Comments

(0)