Skip to content

Cleanup: remove ts::Buffer from ControlBase. #9664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SolidWallOfCode merged 2 commits into from
May 2, 2023
Merged

Cleanup: remove ts::Buffer from ControlBase. #9664

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9402627
Cleanup: remove ts::Buffer from ControlBase.
SolidWallOfCode May 1, 2023
457c940
Tweak print formats.
SolidWallOfCode May 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions proxy/ControlBase.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
*
*
****************************************************************************/
#include "swoc/MemSpan.h"

#include "tscore/ink_platform.h"
#include "tscore/ink_defs.h"
#include "tscore/ink_time.h"
Expand All @@ -40,8 +42,6 @@
#include "ControlMatcher.h"
#include "HdrUtils.h"

#include "tscore/TsBuffer.h"

#include <vector>

/** Used for printing IP address.
Expand Down Expand Up @@ -396,7 +396,7 @@ SchemeMod::make(char *value, const char **error)
// This is a base class for all of the mods that have a
// text string.
struct TextMod : public ControlBase::Modifier {
ts::Buffer text;
swoc::MemSpan<char> text;

TextMod();
~TextMod() override;
Expand All @@ -417,18 +417,18 @@ TextMod::~TextMod()
void
TextMod::print(FILE *f) const
{
fprintf(f, "%s=%*s ", this->name(), static_cast<int>(text.size()), text.data());
fprintf(f, "%s=%.*s ", this->name(), static_cast<int>(text.size()), text.data());
}

void
TextMod::set(const char *value)
{
free(this->text.data());
this->text.set(ats_strdup(value), strlen(value));
this->text.assign(ats_strdup(value), strlen(value));
}

struct MultiTextMod : public ControlBase::Modifier {
std::vector<ts::Buffer> text_vec;
std::vector<swoc::MemSpan<char>> text_vec;
MultiTextMod();
~MultiTextMod() override;

Expand All @@ -449,7 +449,7 @@ void
MultiTextMod::print(FILE *f) const
{
for (auto text_iter : this->text_vec) {
fprintf(f, "%s=%*s ", this->name(), static_cast<int>(text_iter.size()), text_iter.data());
fprintf(f, "%s=%.*s ", this->name(), static_cast<int>(text_iter.size()), text_iter.data());
}
}

Expand All @@ -459,8 +459,8 @@ MultiTextMod::set(char *value)
Tokenizer rangeTok(",");
int num_tok = rangeTok.Initialize(value, SHARE_TOKS);
for (int i = 0; i < num_tok; i++) {
ts::Buffer text;
text.set(ats_strdup(rangeTok[i]), strlen(rangeTok[i]));
swoc::MemSpan<char> text;
text.assign(ats_strdup(rangeTok[i]), strlen(rangeTok[i]));
this->text_vec.push_back(text);
}
}
Expand Down Expand Up @@ -576,7 +576,7 @@ SuffixMod::check(HttpRequestData *req) const
const char *path = req->hdr->url_get()->path_get(&path_len);

if (1 == static_cast<int>(this->text_vec.size()) && 1 == static_cast<int>(this->text_vec[0].size()) &&
0 == strcmp(this->text_vec[0].data(), "*")) {
this->text_vec[0][0] == '*') {
return true;
}

Expand Down