Skip to content

ProtocolStack variable rename: n -> count #7006

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
maskit merged 1 commit into from
Jul 15, 2020
Merged

ProtocolStack variable rename: n -> count #7006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions doc/developer-guide/api/functions/TSClientProtocolStack.en.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ Synopsis

#include <ts/ts.h>

.. function:: TSReturnCode TSHttpTxnClientProtocolStackGet(TSHttpTxn txnp, int n, char const** result, int* actual)
.. function:: TSReturnCode TSHttpTxnClientProtocolStackGet(TSHttpTxn txnp, int count, char const** result, int* actual)

.. function:: TSReturnCode TSHttpTxnServerProtocolStackGet(TSHttpTxn txnp, int n, const char** result, int* actual)
.. function:: TSReturnCode TSHttpTxnServerProtocolStackGet(TSHttpTxn txnp, int count, const char** result, int* actual)

.. function:: TSReturnCode TSHttpSsnClientProtocolStackGet(TSHttpSsn ssnp, int n, char const** result, int* actual)
.. function:: TSReturnCode TSHttpSsnClientProtocolStackGet(TSHttpSsn ssnp, int count, char const** result, int* actual)

.. function:: char const* TSHttpTxnClientProtocolStackContains(TSHttpTxn txnp)

Expand Down
6 changes: 3 additions & 3 deletions include/ts/ts.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2520,8 +2520,8 @@ tsapi const char *TSHttpTxnPluginTagGet(TSHttpTxn txnp);
/*
* Return information about the client protocols.
*/
tsapi TSReturnCode TSHttpTxnClientProtocolStackGet(TSHttpTxn txnp, int n, const char **result, int *actual);
tsapi TSReturnCode TSHttpSsnClientProtocolStackGet(TSHttpSsn ssnp, int n, const char **result, int *actual);
tsapi TSReturnCode TSHttpTxnClientProtocolStackGet(TSHttpTxn txnp, int count, const char **result, int *actual);
tsapi TSReturnCode TSHttpSsnClientProtocolStackGet(TSHttpSsn ssnp, int count, const char **result, int *actual);
tsapi const char *TSHttpTxnClientProtocolStackContains(TSHttpTxn txnp, char const *tag);
tsapi const char *TSHttpSsnClientProtocolStackContains(TSHttpSsn ssnp, char const *tag);
tsapi const char *TSNormalizedProtocolTag(char const *tag);
Expand All @@ -2530,7 +2530,7 @@ tsapi const char *TSRegisterProtocolTag(char const *tag);
/*
* Return information about the server protocols.
*/
tsapi TSReturnCode TSHttpTxnServerProtocolStackGet(TSHttpTxn txnp, int n, const char **result, int *actual);
tsapi TSReturnCode TSHttpTxnServerProtocolStackGet(TSHttpTxn txnp, int count, const char **result, int *actual);
tsapi const char *TSHttpTxnServerProtocolStackContains(TSHttpTxn txnp, char const *tag);

// If, for the given transaction, the URL has been remapped, this function puts the memory location of the "from" URL object in
Expand Down
52 changes: 26 additions & 26 deletions src/traffic_server/InkAPI.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9657,62 +9657,62 @@ TSHttpSsnIdGet(TSHttpSsn ssnp)

// Return information about the protocols used by the client
TSReturnCode
TSHttpTxnClientProtocolStackGet(TSHttpTxn txnp, int n, const char **result, int *actual)
TSHttpTxnClientProtocolStackGet(TSHttpTxn txnp, int count, const char **result, int *actual)
{
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
sdk_assert(n == 0 || result != nullptr);
HttpSM *sm = reinterpret_cast<HttpSM *>(txnp);
int count = 0;
if (sm && n > 0) {
auto mem = static_cast<std::string_view *>(alloca(sizeof(std::string_view) * n));
count = sm->populate_client_protocol(mem, n);
for (int i = 0; i < count; ++i) {
sdk_assert(count == 0 || result != nullptr);
HttpSM *sm = reinterpret_cast<HttpSM *>(txnp);
int new_count = 0;
if (sm && count > 0) {
auto mem = static_cast<std::string_view *>(alloca(sizeof(std::string_view) * count));
new_count = sm->populate_client_protocol(mem, count);
for (int i = 0; i < new_count; ++i) {
result[i] = mem[i].data();
}
}
if (actual) {
*actual = count;
*actual = new_count;
}
return TS_SUCCESS;
}

TSReturnCode
TSHttpSsnClientProtocolStackGet(TSHttpSsn ssnp, int n, const char **result, int *actual)
TSHttpSsnClientProtocolStackGet(TSHttpSsn ssnp, int count, const char **result, int *actual)
{
sdk_assert(sdk_sanity_check_http_ssn(ssnp) == TS_SUCCESS);
sdk_assert(n == 0 || result != nullptr);
sdk_assert(count == 0 || result != nullptr);
auto const *cs = reinterpret_cast<ProxySession *>(ssnp);
int count = 0;
if (cs && n > 0) {
auto mem = static_cast<std::string_view *>(alloca(sizeof(std::string_view) * n));
count = cs->populate_protocol(mem, n);
for (int i = 0; i < count; ++i) {
int new_count = 0;
if (cs && count > 0) {
auto mem = static_cast<std::string_view *>(alloca(sizeof(std::string_view) * count));
new_count = cs->populate_protocol(mem, count);
for (int i = 0; i < new_count; ++i) {
result[i] = mem[i].data();
}
}
if (actual) {
*actual = count;
*actual = new_count;
}
return TS_SUCCESS;
}

// Return information about the protocols used by the server
TSReturnCode
TSHttpTxnServerProtocolStackGet(TSHttpTxn txnp, int n, const char **result, int *actual)
TSHttpTxnServerProtocolStackGet(TSHttpTxn txnp, int count, const char **result, int *actual)
{
sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS);
sdk_assert(n == 0 || result != nullptr);
HttpSM *sm = reinterpret_cast<HttpSM *>(txnp);
int count = 0;
if (sm && n > 0) {
auto mem = static_cast<std::string_view *>(alloca(sizeof(std::string_view) * n));
count = sm->populate_server_protocol(mem, n);
for (int i = 0; i < count; ++i) {
sdk_assert(count == 0 || result != nullptr);
HttpSM *sm = reinterpret_cast<HttpSM *>(txnp);
int new_count = 0;
if (sm && count > 0) {
auto mem = static_cast<std::string_view *>(alloca(sizeof(std::string_view) * count));
new_count = sm->populate_server_protocol(mem, count);
for (int i = 0; i < new_count; ++i) {
result[i] = mem[i].data();
}
}
if (actual) {
*actual = count;
*actual = new_count;
}
return TS_SUCCESS;
}
Expand Down