Rename
diff --git a/examples/client.cc b/examples/client.cc
index 8a74add..a5977c0 100644
--- a/examples/client.cc
+++ b/examples/client.cc
@@ -1278,7 +1278,7 @@
if (rv != 0) {
std::cerr << "ngtcp2_conn_read_pkt: " << ngtcp2_strerror(rv) << std::endl;
if (!last_error_.code) {
- last_error_ = quicErrorTransport(rv);
+ last_error_ = quic_err_transport(rv);
}
disconnect();
return -1;
@@ -1336,7 +1336,7 @@
auto rv = send_packet();
if (rv != NETWORK_ERR_OK) {
if (rv != NETWORK_ERR_SEND_BLOCKED) {
- last_error_ = quicErrorTransport(NGTCP2_ERR_INTERNAL);
+ last_error_ = quic_err_transport(NGTCP2_ERR_INTERNAL);
disconnect();
}
return rv;
@@ -1351,7 +1351,7 @@
if (rv != 0) {
std::cerr << "ngtcp2_conn_on_loss_detection_timer: "
<< ngtcp2_strerror(rv) << std::endl;
- last_error_ = quicErrorTransport(NGTCP2_ERR_INTERNAL);
+ last_error_ = quic_err_transport(NGTCP2_ERR_INTERNAL);
disconnect();
return -1;
}
@@ -1381,7 +1381,7 @@
if (nwrite < 0) {
std::cerr << "ngtcp2_conn_write_pkt: " << ngtcp2_strerror(nwrite)
<< std::endl;
- last_error_ = quicErrorTransport(nwrite);
+ last_error_ = quic_err_transport(nwrite);
disconnect();
return -1;
}
@@ -1411,7 +1411,7 @@
if (sveccnt < 0) {
std::cerr << "nghttp3_conn_writev_stream: "
<< nghttp3_strerror(sveccnt) << std::endl;
- last_error_ = quicErrorApplication(sveccnt);
+ last_error_ = quic_err_app(sveccnt);
disconnect();
return -1;
}
@@ -1439,7 +1439,7 @@
if (rv != 0) {
std::cerr << "nghttp3_conn_block_stream: " << nghttp3_strerror(rv)
<< std::endl;
- last_error_ = quicErrorApplication(rv);
+ last_error_ = quic_err_app(rv);
disconnect();
return -1;
}
@@ -1455,7 +1455,7 @@
if (rv != 0) {
std::cerr << "nghttp3_conn_add_write_offset: "
<< nghttp3_strerror(rv) << std::endl;
- last_error_ = quicErrorApplication(rv);
+ last_error_ = quic_err_app(rv);
disconnect();
return -1;
}
@@ -1464,7 +1464,7 @@
std::cerr << "ngtcp2_conn_write_stream: " << ngtcp2_strerror(nwrite)
<< std::endl;
- last_error_ = quicErrorTransport(nwrite);
+ last_error_ = quic_err_transport(nwrite);
disconnect();
return -1;
}
@@ -1481,7 +1481,7 @@
if (rv != 0) {
std::cerr << "nghttp3_conn_add_write_offset: "
<< nghttp3_strerror(rv) << std::endl;
- last_error_ = quicErrorApplication(rv);
+ last_error_ = quic_err_app(rv);
disconnect();
return -1;
}
@@ -1980,7 +1980,7 @@
if (rv != 0) {
std::cerr << "nghttp3_conn_close_stream: " << nghttp3_strerror(rv)
<< std::endl;
- last_error_ = quicErrorApplication(rv);
+ last_error_ = quic_err_app(rv);
return -1;
}
}
@@ -2185,7 +2185,7 @@
if (nconsumed < 0) {
std::cerr << "nghttp3_conn_read_stream: " << nghttp3_strerror(nconsumed)
<< std::endl;
- last_error_ = quicErrorApplication(nconsumed);
+ last_error_ = quic_err_app(nconsumed);
return -1;
}
@@ -2264,9 +2264,7 @@
void Client::start_wev() { ev_io_start(loop_, &wev_); }
-void Client::set_tls_alert(uint8_t alert) {
- last_error_ = quicErrorTransportTLS(alert);
-}
+void Client::set_tls_alert(uint8_t alert) { last_error_ = quic_err_tls(alert); }
namespace {
int http_acked_stream_data(nghttp3_conn *conn, int64_t stream_id,
diff --git a/examples/server.cc b/examples/server.cc
index 65bd35f..703942b 100644
--- a/examples/server.cc
+++ b/examples/server.cc
@@ -2040,7 +2040,7 @@
return NETWORK_ERR_CLOSE_WAIT;
}
if (!last_error_.code) {
- last_error_ = quicErrorTransport(rv);
+ last_error_ = quic_err_transport(rv);
}
return handle_error();
}
@@ -2113,7 +2113,7 @@
if (sveccnt < 0) {
std::cerr << "nghttp3_conn_writev_stream: " << nghttp3_strerror(sveccnt)
<< std::endl;
- last_error_ = quicErrorApplication(sveccnt);
+ last_error_ = quic_err_app(sveccnt);
return handle_error();
}
}
@@ -2128,7 +2128,7 @@
if (nwrite < 0) {
std::cerr << "ngtcp2_conn_write_pkt: " << ngtcp2_strerror(nwrite)
<< std::endl;
- last_error_ = quicErrorTransport(nwrite);
+ last_error_ = quic_err_transport(nwrite);
return handle_error();
}
if (nwrite == 0) {
@@ -2168,7 +2168,7 @@
if (rv != 0) {
std::cerr << "nghttp3_conn_block_stream: " << nghttp3_strerror(rv)
<< std::endl;
- last_error_ = quicErrorApplication(rv);
+ last_error_ = quic_err_app(rv);
return handle_error();
}
should_break = true;
@@ -2182,7 +2182,7 @@
if (rv != 0) {
std::cerr << "nghttp3_conn_add_write_offset: "
<< nghttp3_strerror(rv) << std::endl;
- last_error_ = quicErrorApplication(rv);
+ last_error_ = quic_err_app(rv);
return handle_error();
}
should_break = true;
@@ -2195,7 +2195,7 @@
std::cerr << "ngtcp2_conn_write_stream: " << ngtcp2_strerror(nwrite)
<< std::endl;
- last_error_ = quicErrorTransport(nwrite);
+ last_error_ = quic_err_transport(nwrite);
return handle_error();
}
@@ -2211,7 +2211,7 @@
if (rv != 0) {
std::cerr << "nghttp3_conn_add_write_offset: " << nghttp3_strerror(rv)
<< std::endl;
- last_error_ = quicErrorApplication(rv);
+ last_error_ = quic_err_app(rv);
return handle_error();
}
}
@@ -2366,7 +2366,7 @@
if (nconsumed < 0) {
std::cerr << "nghttp3_conn_read_stream: " << nghttp3_strerror(nconsumed)
<< std::endl;
- last_error_ = quicErrorApplication(nconsumed);
+ last_error_ = quic_err_app(nconsumed);
return -1;
}
@@ -2498,7 +2498,7 @@
if (rv != 0) {
std::cerr << "nghttp3_conn_close_stream: " << nghttp3_strerror(rv)
<< std::endl;
- last_error_ = quicErrorApplication(rv);
+ last_error_ = quic_err_app(rv);
return -1;
}
}
@@ -2513,7 +2513,7 @@
}
void Handler::set_tls_alert(uint8_t alert) {
- last_error_ = quicErrorTransportTLS(alert);
+ last_error_ = quic_err_tls(alert);
}
namespace {
diff --git a/examples/shared.cc b/examples/shared.cc
index e27ebe6..804f754 100644
--- a/examples/shared.cc
+++ b/examples/shared.cc
@@ -28,7 +28,7 @@
namespace ngtcp2 {
-QUICError quicErrorTransport(int liberr) {
+QUICError quic_err_transport(int liberr) {
if (liberr == NGTCP2_ERR_RECV_VERSION_NEGOTIATION) {
return {QUICErrorType::TransportVersionNegotiation, 0};
}
@@ -36,12 +36,12 @@
ngtcp2_err_infer_quic_transport_error_code(liberr)};
}
-QUICError quicErrorTransportTLS(int alert) {
+QUICError quic_err_tls(int alert) {
return {QUICErrorType::Transport,
static_cast<uint16_t>(NGTCP2_CRYPTO_ERROR | alert)};
}
-QUICError quicErrorApplication(int liberr) {
+QUICError quic_err_app(int liberr) {
return {QUICErrorType::Application,
nghttp3_err_infer_quic_app_error_code(liberr)};
}
diff --git a/examples/shared.h b/examples/shared.h
index 3e1dcaa..4503d3d 100644
--- a/examples/shared.h
+++ b/examples/shared.h
@@ -49,11 +49,11 @@
uint16_t code;
};
-QUICError quicErrorTransport(int liberr);
+QUICError quic_err_transport(int liberr);
-QUICError quicErrorTransportTLS(int alert);
+QUICError quic_err_tls(int alert);
-QUICError quicErrorApplication(int liberr);
+QUICError quic_err_app(int liberr);
} // namespace ngtcp2