8000 Rename GalleySeries to GalleyVector · postgrespro/libblobstamper@14b2e7a · GitHub
[go: up one dir, main page]
Skip to content

Commit 14b2e7a

Browse files
nataraj-hates-MS-for-stealing-githubnataraj-hates-MS-for-stealing-github
committed
Rename GalleySeries to GalleyVector
1 parent 4a46de2 commit 14b2e7a

File tree

4 files changed

+29
-29
lines changed

4 files changed

+29
-29
lines changed

‎blobstamper/galley.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111

1212
int
13-
GalleySeries::minSize()
13+
GalleyVector::minSize()
1414
{
1515
if (stamp.isFixedSize())
1616
{
@@ -32,7 +32,7 @@ GalleySeries::minSize()
3232

3333

3434
std::vector<std::string>
35-
GalleySeries::ExtractStr(Blob &blob)
35+
GalleyVector::ExtractStr(Blob &blob)
3636
{
3737
std::vector<std::string> res;
3838
std::vector<Blob> blobs = extract_internal(blob);
@@ -45,7 +45,7 @@ GalleySeries::ExtractStr(Blob &blob)
4545
}
4646

4747
std::vector<std::vector<char>>
48-
GalleySeries::ExtractBin(Blob &blob)
48+
GalleyVector::ExtractBin(Blob &blob)
4949
{
5050
std::vector<std::vector<char>> res;
5151
std::vector<Blob> blobs = extract_internal(blob);
@@ -58,7 +58,7 @@ GalleySeries::ExtractBin(Blob &blob)
5858
}
5959

6060
std::vector<Blob>
61-
GalleySeries::extract_internal(Blob &blob)
61+
GalleyVector::extract_internal(Blob &blob)
6262
{
6363
if (blob.Size()<stamp.minSize())
6464
{

‎blobstamper/galley.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ class GalleyBase
2222

2323
};
2424

25-
class GalleySeries : public GalleyBase
25+
class GalleyVector : public GalleyBase
2626
{
2727
protected:
2828
StampBase &stamp;
2929
public:
30-
GalleySeries(StampBase & stamp_arg) : stamp(stamp_arg) {};
30+
GalleyVector(StampBase & stamp_arg) : stamp(stamp_arg) {};
3131
std::vector<Blob> extract_internal(Blob &blob);
3232
std::vector<std::string> ExtractStr(Blob &blob);
3333
std::vector<std::vector<char>> ExtractBin(Blob &blob);

‎t/300-galley.cpp

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ main()
2727
std::string expected3 = "56";
2828

2929
StampTwoChars stamp;
30-
GalleySeries galley(stamp);
30+
GalleyVector galley(stamp);
3131
Blob blob(short_sample, strlen(short_sample));
3232
std::vector<std::string> res = galley.ExtractStr(blob);
3333

34-
is(res[0], expected1, "GalleySeries, fixed size string stamp: First element of shifted list is ok");
35-
is(res[1], expected2, "GalleySeries, fixed size string stamp: Second element of shifted list is ok");
36-
is(res[2], expected3, "GalleySeries, fixed size string stamp: Third element of shifted list is ok");
37-
is(res.size(), 3, "GalleySeries, fixed size string stamp: res has 3 items");
34+
is(res[0], expected1, "GalleyVector, fixed size string stamp: First element of shifted list is ok");
35+
is(res[1], expected2, "GalleyVector, fixed size string stamp: Second element of shifted list is ok");
36+
is(res[2], expected3, "GalleyVector, fixed size string stamp: Third element of shifted list is ok");
37+
is(res.size(), 3, "GalleyVector, fixed size string stamp: res has 3 items");
3838
}
3939
/* Test Galley Sereies with unlimited size stamp*/
4040
{ /* 5 .. 9*/
@@ -48,16 +48,16 @@ main()
4848

4949
Blob blob(longer_sample, strlen(longer_sample));
5050
StampTwoCharsList stamp_charlist;
51-
GalleySeries galley(stamp_charlist);
51+
GalleyVector galley(stamp_charlist);
5252

5353
std::vector<std::string> res = galley.ExtractStr(blob);
5454
std::string str;
5555

56-
is(res[0], expected1, "GalleySeries, unlimited size string stamp: First element of shifted list is ok");
57-
is(res[1], expected2, "GalleySeries, unlimited size string stamp: Second element of shifted list is ok");
58-
is(res[2], expected3, "GalleySeries, unlimited size string stamp: Third element of shifted list is ok");
59-
is(res[3], expected4, "GalleySeries, unlimited size string stamp: Fourth element of shifted list is ok");
60-
is(res.size(), 4, "GalleySeries, unlimited size string stamp: The rest of the list is empty");
56+
is(res[0], expected1, "GalleyVector, unlimited size string stamp: First element of shifted list is ok");
57+
is(res[1], expected2, "GalleyVector, unlimited size string stamp: Second element of shifted list is ok");
58+
is(res[2], expected3, "GalleyVector, unlimited size string stamp: Third element of shifted list is ok");
59+
is(res[3], expected4, "GalleyVector, unlimited size string stamp: Fourth element of shifted list is ok");
60+
is(res.size(), 4, "GalleyVector, unlimited size string stamp: The rest of the list is empty");
6161
}
6262

6363
{ /* 10..13 */
@@ -67,7 +67,7 @@ main()
6767
unsigned short int expected3 = (unsigned char) '6' * 256 +(unsigned char) '5';
6868

6969
StampArithm<unsigned short int> stamp;
70-
GalleySeries galley(stamp);
70+
GalleyVector galley(stamp);
7171
Blob blob(short_sample, strlen(short_sample));
7272
std::vector<std::vector<char>> res = galley.ExtractBin(blob);
7373

@@ -76,17 +76,17 @@ main()
7676

7777
v = res[0];
7878
data = (unsigned short int *) &v[0];
79-
is(*data, expected1, "GalleySeries, fixed size binary stamp: First element of shifted list is ok");
79+
is(*data, expected1, "GalleyVector, fixed size binary stamp: First element of shifted list is ok");
8080

8181
v = res[1];
8282
data = (unsigned short int *) &v[0];
83-
is(*data, expected2, "GalleySeries, fixed size binary stamp: Second element of shifted list is ok");
83+
is(*data, expected2, "GalleyVector, fixed size binary stamp: Second element of shifted list is ok");
8484

8585
v = res[2];
8686
data = (unsigned short int *) &v[0];
87-
is(*data, expected3, "GalleySeries, fixed size binary stamp: Third element of shifted list is ok");
87+
is(*data, expected3, "GalleyVector, fixed size binary stamp: Third element of shifted list is ok");
8888

89-
is(res.size(),3, "GalleySeries, fixed size binary stamp: result has 3 elements");
89+
is(res.size(),3, "GalleyVector, fixed size binary stamp: result has 3 elements");
9090
}
9191

9292
/* Test Galley Sereies with variated size stamp*/
@@ -103,17 +103,17 @@ main()
103103

104104
Blob blob(sample, strlen(sample));
105105
StampSeveralChars stamp;
106-
GalleySeries galley(stamp);
106+
GalleyVector galley(stamp);
107107

108108
std::vector<std::string> res = galley.ExtractStr(blob);
109109
std::string str;
110110

111-
is(res[0], expected1, "GalleySeries, unlimited size string stamp: First element of shifted list is ok");
112-
is(res[1], expected2, "GalleySeries, unlimited size string stamp: Second element of shifted list is ok");
113-
is(res[2], expected3, "GalleySeries, unlimited size string stamp: Third element of shifted list is ok");
114-
is(res[3], expected4, "GalleySeries, unlimited size string stamp: Fourth element of shifted list is ok");
111+
is(res[0], expected1, "GalleyVector, unlimited size string stamp: First element of shifted list is ok");
112+
is(res[1], expected2, "GalleyVector, unlimited size string stamp: Second element of shifted list is ok");
113+
is(res[2], expected3, "GalleyVector, unlimited size string stamp: Third element of shifted list is ok");
114+
is(res[3], expected4, "GalleyVector, unlimited size string stamp: Fourth element of shifted list is ok");
115115

116-
is(res.size(), 4, "GalleySeries, unlimited size string stamp: The list has only 4 members");
116+
is(res.size(), 4, "GalleyVector, unlimited size string stamp: The list has only 4 members");
117117

118118
}
119119

‎t/test-chars-stamps.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class StampTwoCharsList: public StampUnbounded
7070
{
7171
protected:
7272
StampTwoChars el_stamp;
73-
GalleySeries galley;
73+
GalleyVector galley;
7474
public:
7575
std::string ExtractStr(Blob &blob) override;
7676
StampTwoCharsList(): el_stamp {}, galley {el_stamp} {};

0 commit comments

Comments
 (0)
0