Skip to content

Refactor includes and fix clang errors/warnings in (MatcherUtils.h, MatcherUtils.cc) generating compilation error during build #13194

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

Open
grahamsedman wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Refactor includes and fix clang errors/warnings in (MatcherUtils.h, MatcherUtils.cc) generating compilation error during build #13194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3835a99
chore: update tscore includes in MatcherUtils.h
grahamsedman May 22, 2026
b717414
refactor: remove redundant includes and apply modern code style
grahamsedman May 22, 2026
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
3 changes: 2 additions & 1 deletion include/tscore/MatcherUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@
#pragma once

#include "tscore/ParseRules.h"
#include "tscore/Result.h"
#include "tscore/ink_inet.h"
#include "tscore/ink_inet.h"
#include "tscore/ink_platform.h"

// Look in MatcherUtils.cc for comments on function usage
char *readIntoBuffer(const char *file_path, const char *module_name, int *read_size_ptr);
Expand Down
10 changes: 4 additions & 6 deletions src/tscore/MatcherUtils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,11 @@
*
****************************************************************************/

#include "tscore/ink_platform.h"
#include "tscore/Diags.h"
#include "tscore/ink_memory.h"
#include "tscore/ink_inet.h"
#include "tscore/ink_assert.h"
#include "tscore/MatcherUtils.h"
#include "tscore/Tokenizer.h"
#include "tscore/ink_assert.h"
#include "tscore/ink_memory.h"

// char* readIntoBuffer(const char* file_path, const char* module_name,
// int* read_size_ptr)
Expand Down Expand Up @@ -113,7 +111,7 @@ readIntoBuffer(const char *file_path, const char *module_name, int *read_size_pt
// Didn't get the whole file, drop everything. We don't want to return
// something partially read because, ie. with configs, the behaviour
// is undefined.
Error("%s Only able to read %ld bytes out %ld for %s file", module_name, read_size, file_size, file_path);
Error("%s Only able to read %zd bytes out %zd for %s file", module_name, read_size, file_size, file_path);
ats_free(file_buf);
file_buf = nullptr;
}
Expand Down Expand Up @@ -144,7 +142,7 @@ unescapifyStr(char *buffer)
if (*read == '%' && *(read + 1) != '\0' && *(read + 2) != '\0') {
subStr[0] = *(++read);
subStr[1] = *(++read);
*write = static_cast<char>(strtol(subStr, (char **)nullptr, 16));
*write = static_cast<char>(strtol(subStr, static_cast<char **>(nullptr), 16));
read++;
write++;
} else if (*read == '+') {
Expand Down