Skip to content

include/ts: comma on all last enum elements #10400

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
traeak merged 1 commit into from
Sep 11, 2023
Merged

include/ts: comma on all last enum elements #10400

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
49 changes: 29 additions & 20 deletions include/ts/apidefs.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ char const TS_VERSION_STRING[] = "@TS_VERSION_STRING@";
TS_HTTP_STATUS_INSUFFICIENT_STORAGE = 507,
TS_HTTP_STATUS_LOOP_DETECTED = 508,
TS_HTTP_STATUS_NOT_EXTENDED = 510,
TS_HTTP_STATUS_NETWORK_AUTHENTICATION_REQUIRED = 511
TS_HTTP_STATUS_NETWORK_AUTHENTICATION_REQUIRED = 511,
};

/**
Expand Down Expand Up @@ -383,7 +383,7 @@ char const TS_VERSION_STRING[] = "@TS_VERSION_STRING@";
TS_EVENT_SSL_CLIENT_HELLO = 60207,
TS_EVENT_SSL_SECRET = 60208,

TS_EVENT_MGMT_UPDATE = 60300
TS_EVENT_MGMT_UPDATE = 60300,
};
TSEvent const TS_EVENT_HTTP_READ_REQUEST_PRE_REMAP = TS_EVENT_HTTP_PRE_REMAP; /* backwards compat */

Expand Down Expand Up @@ -502,7 +502,7 @@ char const TS_VERSION_STRING[] = "@TS_VERSION_STRING@";
TS_VCONN_OUTBOUND_START_HOOK,
TS_VCONN_OUTBOUND_CLOSE_HOOK,
TS_SSL_LAST_HOOK = TS_VCONN_OUTBOUND_CLOSE_HOOK,
TS_HTTP_LAST_HOOK
TS_HTTP_LAST_HOOK,
};

/** Plugin lifecycle hooks.
Expand Down Expand Up @@ -588,7 +588,7 @@ char const TS_VERSION_STRING[] = "@TS_VERSION_STRING@";
TS_LIFECYCLE_TASK_THREADS_READY_HOOK,
TS_LIFECYCLE_SHUTDOWN_HOOK,
TS_LIFECYCLE_SSL_SECRET_HOOK,
TS_LIFECYCLE_LAST_HOOK
TS_LIFECYCLE_LAST_HOOK,
};

enum TSServerState {
Expand All @@ -603,18 +603,23 @@ char const TS_VERSION_STRING[] = "@TS_VERSION_STRING@";
TS_SRVSTATE_PARSE_ERROR,
TS_SRVSTATE_TRANSACTION_COMPLETE,
TS_SRVSTATE_PARENT_RETRY,
TS_SRVSTATE_OUTBOUND_CONGESTION
TS_SRVSTATE_OUTBOUND_CONGESTION,
};

enum TSLookingUpType {
TS_LOOKUP_UNDEFINED_LOOKUP,
TS_LOOKUP_PARENT_PROXY,
TS_LOOKUP_ORIGIN_SERVER,
TS_LOOKUP_INCOMING_ROUTER,
TS_LOOKUP_HOST_NONE
TS_LOOKUP_HOST_NONE,
};

enum TSCacheLookupResult { TS_CACHE_LOOKUP_MISS, TS_CACHE_LOOKUP_HIT_STALE, TS_CACHE_LOOKUP_HIT_FRESH, TS_CACHE_LOOKUP_SKIPPED };
enum TSCacheLookupResult {
TS_CACHE_LOOKUP_MISS,
TS_CACHE_LOOKUP_HIT_STALE,
TS_CACHE_LOOKUP_HIT_FRESH,
TS_CACHE_LOOKUP_SKIPPED,
};

enum TSCacheDataType {
TS_CACHE_DATA_TYPE_NONE,
Expand All @@ -634,7 +639,7 @@ char const TS_VERSION_STRING[] = "@TS_VERSION_STRING@";
TS_CACHE_SCAN_RESULT_DELETE = 10,
TS_CACHE_SCAN_RESULT_DELETE_ALL_ALTERNATES,
TS_CACHE_SCAN_RESULT_UPDATE,
TS_CACHE_SCAN_RESULT_RETRY
TS_CACHE_SCAN_RESULT_RETRY,
};

enum TSHttpTxnInfoKey {
Expand All @@ -645,7 +650,7 @@ char const TS_VERSION_STRING[] = "@TS_VERSION_STRING@";
TS_TXN_INFO_CACHE_OPEN_READ_TRIES,
TS_TXN_INFO_CACHE_OPEN_WRITE_TRIES,
TS_TXN_INFO_CACHE_VOLUME,
TS_TXN_INFO_LAST_ENTRY
TS_TXN_INFO_LAST_ENTRY,
};

enum TSVConnCloseFlags {
Expand All @@ -668,7 +673,7 @@ char const TS_VERSION_STRING[] = "@TS_VERSION_STRING@";
TS_IOBUFFER_SIZE_INDEX_256K = 11,
TS_IOBUFFER_SIZE_INDEX_512K = 12,
TS_IOBUFFER_SIZE_INDEX_1M = 13,
TS_IOBUFFER_SIZE_INDEX_2M = 14
TS_IOBUFFER_SIZE_INDEX_2M = 14,
};

enum TSIOBufferWaterMark {
Expand All @@ -694,7 +699,7 @@ char const TS_VERSION_STRING[] = "@TS_VERSION_STRING@";
TS_SERVER_OUTBOUND_MATCH_IP,
TS_SERVER_OUTBOUND_MATCH_PORT,
TS_SERVER_OUTBOUND_MATCH_HOST,
TS_SERVER_OUTBOUND_MATCH_BOTH
TS_SERVER_OUTBOUND_MATCH_BOTH,
};

/* librecords types */
Expand All @@ -706,7 +711,7 @@ char const TS_VERSION_STRING[] = "@TS_VERSION_STRING@";
TS_RECORDTYPE_PROCESS = 0x02,
TS_RECORDTYPE_NODE = 0x04,
TS_RECORDTYPE_PLUGIN = 0x20,
TS_RECORDTYPE_ALL = 0x3F
TS_RECORDTYPE_ALL = 0x3F,
};

/* The values of this enum must match enum RecDataT in I_RecDefs.h */
Expand All @@ -718,7 +723,7 @@ char const TS_VERSION_STRING[] = "@TS_VERSION_STRING@";
TS_RECORDDATATYPE_COUNTER,
TS_RECORDDATATYPE_STAT_CONST,
TS_RECORDDATATYPE_STAT_FX,
TS_RECORDDATATYPE_MAX
TS_RECORDDATATYPE_MAX,
};

union TSRecordData {
Expand Down Expand Up @@ -889,7 +894,7 @@ char const TS_VERSION_STRING[] = "@TS_VERSION_STRING@";
TS_CONFIG_NET_DEFAULT_INACTIVITY_TIMEOUT,
TS_CONFIG_HTTP_NO_DNS_JUST_FORWARD_TO_PARENT,
TS_CONFIG_HTTP_CACHE_IGNORE_QUERY,
TS_CONFIG_LAST_ENTRY
TS_CONFIG_LAST_ENTRY,
};

/* The TASK pool of threads is the primary method of off-loading continuations from the
Expand All @@ -899,7 +904,7 @@ char const TS_VERSION_STRING[] = "@TS_VERSION_STRING@";
TS_THREAD_POOL_TASK,
/* unlikely you should use these */
TS_THREAD_POOL_DNS,
TS_THREAD_POOL_UDP
TS_THREAD_POOL_UDP,
};

/* TSHRTime stuff, this is a candidate for deprecation in v10.0.0 */
Expand Down Expand Up @@ -959,7 +964,7 @@ char const TS_VERSION_STRING[] = "@TS_VERSION_STRING@";
TS_MILESTONE_PLUGIN_TOTAL,
TS_MILESTONE_TLS_HANDSHAKE_START,
TS_MILESTONE_TLS_HANDSHAKE_END,
TS_MILESTONE_LAST_ENTRY
TS_MILESTONE_LAST_ENTRY,
};

/* These type aliases are used with the corresponding TSMgmt*Get functions
Expand All @@ -976,7 +981,7 @@ char const TS_VERSION_STRING[] = "@TS_VERSION_STRING@";
TS_MGMT_SOURCE_DEFAULT, ///< Built in core default.
TS_MGMT_SOURCE_PLUGIN, ///< Plugin supplied default.
TS_MGMT_SOURCE_EXPLICIT, ///< Set by administrator (config file, external API, etc.)
TS_MGMT_SOURCE_ENV ///< Process environment variable.
TS_MGMT_SOURCE_ENV, ///< Process environment variable.
};

/// The User Arg type, used for Txn/Ssn/VConn user argument slots
Expand All @@ -985,7 +990,7 @@ char const TS_VERSION_STRING[] = "@TS_VERSION_STRING@";
TS_USER_ARGS_SSN, ///< Session based
TS_USER_ARGS_VCONN, ///< VConnection based
TS_USER_ARGS_GLB, ///< Global based
TS_USER_ARGS_COUNT ///< Fake enum, # of valid entries.
TS_USER_ARGS_COUNT, ///< Fake enum, # of valid entries.
};

/** An enumeration of HTTP version types for the priority functions that behave
Expand Down Expand Up @@ -1103,7 +1108,11 @@ char const TS_VERSION_STRING[] = "@TS_VERSION_STRING@";
size_t key_name_len;
};

enum TSConnectType { TS_CONNECT_UNDEFINED, TS_CONNECT_PLUGIN, TS_CONNECT_LAST_ENTRY };
enum TSConnectType {
TS_CONNECT_UNDEFINED,
TS_CONNECT_PLUGIN,
TS_CONNECT_LAST_ENTRY,
};

struct TSHttpConnectOptions {
TSConnectType connect_type;
Expand Down Expand Up @@ -1468,7 +1477,7 @@ char const TS_VERSION_STRING[] = "@TS_VERSION_STRING@";
TS_HTTP_CNTL_REQUEST_CACHEABLE,
TS_HTTP_CNTL_SERVER_NO_STORE,
TS_HTTP_CNTL_TXN_DEBUG,
TS_HTTP_CNTL_SKIP_REMAPPING
TS_HTTP_CNTL_SKIP_REMAPPING,
};

// JSONRPC 2.0 related interface.
Expand Down
2 changes: 1 addition & 1 deletion include/ts/experimental.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ namespace c
TS_FETCH_EVENT_EXT_HEAD_READY = -1,
TS_FETCH_EVENT_EXT_HEAD_DONE = -2,
TS_FETCH_EVENT_EXT_BODY_READY = -3,
TS_FETCH_EVENT_EXT_BODY_DONE = -4
TS_FETCH_EVENT_EXT_BODY_DONE = -4,
};

enum TSFetchFlags {
Expand Down
4 changes: 2 additions & 2 deletions include/ts/remap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ namespace c
....
This would allow a plugin to generate an error page. Right now,
setting the return code to any negative number is equivalent to TSREMAP_NO_REMAP */
TSREMAP_ERROR = -1 /* Some error, that should generate an error page */
TSREMAP_ERROR = -1, /* Some error, that should generate an error page */
};

/* Status code passed to the plugin by TSRemapPostConfigReload() signaling
Expand All @@ -81,7 +81,7 @@ namespace c
TSREMAP_CONFIG_RELOAD_SUCCESS_PLUGIN_USED =
1, /* configuration parsing succeeded and plugin was used by the new configuration */
TSREMAP_CONFIG_RELOAD_SUCCESS_PLUGIN_UNUSED =
2 /* configuration parsing succeeded but plugin was NOT used by the new configuration */
2, /* configuration parsing succeeded but plugin was NOT used by the new configuration */
};

} // end namespace c
Expand Down