Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5d1bde4

Browse files
Some code cleanup and clearafication
1 parentb68fd74 commit5d1bde4

File tree

7 files changed

+19
-22
lines changed

7 files changed

+19
-22
lines changed

‎blobstamper/blob.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Blob::Size()
5656
void *
5757
Blob::ShiftSingleStampBin(StampBase& stmp)
5858
{
59-
return stmp.Extract(*this);
59+
return stmp.ExtractBin(*this);
6060
}
6161

6262
std::string

‎blobstamper/galley.cpp‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
2-
3-
41
#include"blob.h"
52
#include"stamp.h"
63
#include"stamp_atomic.h"
@@ -9,7 +6,7 @@
96

107

118
std::list<std::string>
12-
GalleySeries::Extract(Blob &blob)
9+
GalleySeries::ExtractStr(Blob &blob)
1310
{
1411
std::list<std::string> res;
1512
std::list<Blob> blobs =extract_internal(blob);
@@ -53,7 +50,7 @@ GalleySeries::extract_internal(Blob &blob)
5350
}
5451
else
5552
{
56-
if (stamp.maxSize() == -1)// if unlimited size
53+
if (stamp.isUnbounded())
5754
{
5855
/*
5956
The idea of this part is following:

‎blobstamper/galley.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class GalleySeries : public GalleyBase
2626
public:
2727
GalleySeries(StampBase & stamp_arg) : stamp(stamp_arg) {};
2828
std::list<Blob>extract_internal(Blob &blob);
29-
std::list<std::string>Extract(Blob &blob);
29+
std::list<std::string>ExtractStr(Blob &blob);
3030
std::list<void *>ExtractBin(Blob &blob);
3131

3232
intminSize()override;

‎blobstamper/stamp.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
/* Generic Exrtact Bin function for fixed size stamp. In some cases we need just a chunk of raw blob data.*/
1414
/* Use this method in such a case*/
1515
void *
16-
StampFixed::Extract(Blob &blob)
16+
StampFixed::ExtractBin(Blob &blob)
1717
{
1818
Blob blob2 = blob.ShiftBytes(size);
1919

‎blobstamper/stamp.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ class StampBase
1111
virtualintminSize() = 0;
1212
virtualintmaxSize() = 0;
1313

14-
boolisFixedSize() {returnminSize()==maxSize();}
14+
boolisFixedSize() {returnminSize() ==maxSize();}
1515
boolisUnbounded() {returnmaxSize() == -1;}
1616

17-
virtualvoid *Extract(Blob &blob) {printf ("Not implemented");exit(1);}
17+
virtualvoid *ExtractBin(Blob &blob) {printf ("Not implemented");exit(1);}
1818
virtual std::stringExtractStr(Blob &blob) {printf ("Not implemented");exit(1);}
1919
};
2020

@@ -27,7 +27,7 @@ class StampFixed : public StampBase
2727
virtualintminSize() {return size;}
2828
virtualintmaxSize() {return size;}
2929

30-
void *Extract(Blob &blob)override;
30+
void *ExtractBin(Blob &blob)override;
3131
};
3232

3333
classStampUnbounded :publicStampBase

‎blobstamper/stamp_atomic.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ std::string
1313
StampStrUInt8::ExtractStr(Blob &blob)
1414
{
1515
std::string res;
16-
char *pc = (char *)this->Extract(blob);
16+
char *pc = (char *)this->ExtractBin(blob);
1717
if (! pc)
1818
return"";
1919
res =std::to_string((int) *pc);
@@ -31,7 +31,7 @@ std::string
3131
StampStrUInt16::ExtractStr(Blob &blob)
3232
{
3333
std::string res;
34-
unsignedshortint *pi = (unsignedshortint *)this->Extract(blob);
34+
unsignedshortint *pi = (unsignedshortint *)this->ExtractBin(blob);
3535
if (! pi)
3636
return"";
3737
res =std::to_string(*pi);
@@ -43,7 +43,7 @@ std::string
4343
StampStrSInt16::ExtractStr(Blob &blob)
4444
{
4545
std::string res;
46-
signedshortint *pi = (signedshortint *)this->Extract(blob);
46+
signedshortint *pi = (signedshortint *)this->ExtractBin(blob);
4747
if (! pi)
4848
return"";
4949
res =std::to_string(*pi);
@@ -62,7 +62,7 @@ std::string
6262
StampStrUInt32::ExtractStr(Blob &blob)
6363
{
6464
std::string res;
65-
unsignedint *pi = (unsignedint *)this->Extract(blob);
65+
unsignedint *pi = (unsignedint *)this->ExtractBin(blob);
6666
if (! pi)
6767
return"";
6868
res =std::to_string(*pi);
@@ -74,7 +74,7 @@ std::string
7474
StampStrSInt32::ExtractStr(Blob &blob)
7575
{
7676
std::string res;
77-
signedint *pi = (signedint *)this->Extract(blob);
77+
signedint *pi = (signedint *)this->ExtractBin(blob);
7878
if (! pi)
7979
return"";
8080
res =std::to_string(*pi);
@@ -93,7 +93,7 @@ std::string
9393
StampStrUInt64::ExtractStr(Blob &blob)
9494
{
9595
std::string res;
96-
unsignedlonglong *pi = (unsignedlonglong *)this->Extract(blob);
96+
unsignedlonglong *pi = (unsignedlonglong *)this->ExtractBin(blob);
9797
if (! pi)
9898
return"";
9999
res =std::to_string(*pi);
@@ -105,7 +105,7 @@ std::string
105105
StampStrSInt64::ExtractStr(Blob &blob)
106106
{
107107
std::string res;
108-
signedlonglong *pi = (signedlonglong *)this->Extract(blob);
108+
signedlonglong *pi = (signedlonglong *)this->ExtractBin(blob);
109109
if (! pi)
110110
return"";
111111
res =std::to_string(*pi);
@@ -124,7 +124,7 @@ std::string
124124
StampStrDouble::ExtractStr(Blob &blob)
125125
{
126126
std::string res ="";
127-
double *pd = (double *)this->Extract(blob);
127+
double *pd = (double *)this->ExtractBin(blob);
128128
if (! pd)
129129
return res;
130130

‎t/300-galley.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ std::string
2828
StampTwoCharsList::ExtractStr(Blob &blob)
2929
{
3030
std::string res ="";
31-
std::list<std::string> list = galley.Extract(blob);
31+
std::list<std::string> list = galley.ExtractStr(blob);
3232

3333
for (std::string point : list)
3434
{
@@ -59,7 +59,7 @@ main()
5959
StampTwoChars stamp;
6060
GalleySeriesgalley(stamp);
6161
Blobblob(short_sample,strlen(short_sample));
62-
std::list<std::string> res = galley.Extract(blob);
62+
std::list<std::string> res = galley.ExtractStr(blob);
6363

6464
std::string str;
6565

@@ -91,7 +91,7 @@ main()
9191
StampTwoCharsList stamp_charlist;
9292
GalleySeriesgalley(stamp_charlist);
9393

94-
std::list<std::string> res = galley.Extract(blob);
94+
std::list<std::string> res = galley.ExtractStr(blob);
9595
std::string str;
9696

9797
str = res.front();

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp