Skip to content

Commit

Permalink
Revert " error: invalid suffix on literal; C++11 requires a space bet…
Browse files Browse the repository at this point in the history 
…ween literal and string macro [-Werror=literal-suffix]"

This reverts commit ade432e
  • Loading branch information
@jiridanek
jiridanek committed Apr 24, 2021
1 parent 66dc486 commit eced3bd
Show file tree
Hide file tree
Showing 28 changed files with 411 additions and 411 deletions.
36 changes: 18 additions & 18 deletions src/adaptors/http1/http1_adaptor.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,12 +181,12 @@ void qdr_http1_close_connection(qdr_http1_connection_t *hconn, const char *error
{
if (error) {
qd_log(qdr_http1_adaptor->log, QD_LOG_ERROR,
"[C%" PRIu64 "] Connection closing: %s", hconn->conn_id, error);
"[C%"PRIu64"] Connection closing: %s", hconn->conn_id, error);
}

if (hconn->raw_conn) {
qd_log(qdr_http1_adaptor->log, QD_LOG_DEBUG,
"[C%" PRIu64 "] Initiating close of connection", hconn->conn_id);
"[C%"PRIu64"] Initiating close of connection", hconn->conn_id);
pn_raw_connection_close(hconn->raw_conn);
}

Expand Down Expand Up @@ -307,7 +307,7 @@ uint64_t qdr_http1_write_out_data(qdr_http1_connection_t *hconn, qdr_http1_out_d
for (size_t j = 0; j < written; ++j) {
char *ptr = (char*) buffers[j].bytes;
int len = (int) buffers[j].size;
fprintf(stdout, "\n[C%" PRIu64 "] Raw Write: Ptr=%p len=%d\n value='%.*s'\n",
fprintf(stdout, "\n[C%"PRIu64"] Raw Write: Ptr=%p len=%d\n value='%.*s'\n",
hconn->conn_id, (void*)ptr, len, len, ptr);
fflush(stdout);
}
Expand Down Expand Up @@ -389,7 +389,7 @@ void qdr_http1_free_written_buffers(qdr_http1_connection_t *hconn)
if (HTTP1_DUMP_BUFFERS) {
char *ptr = (char*) buffers[i].bytes;
int len = (int) buffers[i].size;
fprintf(stdout, "\n[C%" PRIu64 "] Raw Written: Ptr=%p len=%d c=%d o=%d\n value='%.*s'\n",
fprintf(stdout, "\n[C%"PRIu64"] Raw Written: Ptr=%p len=%d c=%d o=%d\n value='%.*s'\n",
hconn->conn_id, (void*)ptr, len, buffers[i].capacity, buffers[i].offset, len, ptr);
fflush(stdout);
}
Expand Down Expand Up @@ -460,7 +460,7 @@ static void _core_connection_activate_CT(void *context, qdr_connection_t *conn)
}
sys_mutex_unlock(qdr_http1_adaptor->lock);

qd_log(qdr_http1_adaptor->log, QD_LOG_DEBUG, "[C%" PRIu64 "] Connection %s",
qd_log(qdr_http1_adaptor->log, QD_LOG_DEBUG, "[C%"PRIu64"] Connection %s",
conn->identity, activated ? "activated" : "down, unable to activate");
}

Expand All @@ -474,7 +474,7 @@ static void _core_link_first_attach(void *context,
{
qdr_http1_connection_t *hconn = (qdr_http1_connection_t*) qdr_connection_get_context(conn);
if (hconn)
qd_log(qdr_http1_adaptor->log, QD_LOG_DEBUG, "[C%" PRIu64 "] Link first attach", hconn->conn_id);
qd_log(qdr_http1_adaptor->log, QD_LOG_DEBUG, "[C%"PRIu64"] Link first attach", hconn->conn_id);
}


Expand All @@ -487,7 +487,7 @@ static void _core_link_second_attach(void *context,
if (!hconn) return;

qd_log(qdr_http1_adaptor->log, QD_LOG_DEBUG,
"[C%" PRIu64 "][L%" PRIu64 "] Link second attach", hconn->conn_id, link->identity);
"[C%"PRIu64"][L%"PRIu64"] Link second attach", hconn->conn_id, link->identity);

if (hconn->type == HTTP1_CONN_CLIENT) {
qdr_http1_client_core_second_attach((qdr_http1_adaptor_t*) context,
Expand All @@ -501,7 +501,7 @@ static void _core_link_detach(void *context, qdr_link_t *link, qdr_error_t *erro
qdr_http1_connection_t *hconn = (qdr_http1_connection_t*) qdr_link_get_context(link);
if (hconn) {
qd_log(qdr_http1_adaptor->log, QD_LOG_DEBUG,
"[C%" PRIu64 "][L%" PRIu64 "] Link detach", hconn->conn_id, link->identity);
"[C%"PRIu64"][L%"PRIu64"] Link detach", hconn->conn_id, link->identity);

qdr_link_set_context(link, 0);
if (link == hconn->out_link)
Expand All @@ -517,7 +517,7 @@ static void _core_link_flow(void *context, qdr_link_t *link, int credit)
qdr_http1_connection_t *hconn = (qdr_http1_connection_t*) qdr_link_get_context(link);
if (hconn) {
qd_log(qdr_http1_adaptor->log, QD_LOG_DEBUG,
"[C%" PRIu64 "][L%" PRIu64 "] Link flow (%d)",
"[C%"PRIu64"][L%"PRIu64"] Link flow (%d)",
hconn->conn_id, link->identity, credit);
if (hconn->type == HTTP1_CONN_SERVER)
qdr_http1_server_core_link_flow((qdr_http1_adaptor_t*) context, hconn, link, credit);
Expand All @@ -532,7 +532,7 @@ static void _core_link_offer(void *context, qdr_link_t *link, int delivery_count
qdr_http1_connection_t *hconn = (qdr_http1_connection_t*) qdr_link_get_context(link);
if (hconn) {
qd_log(qdr_http1_adaptor->log, QD_LOG_DEBUG,
"[C%" PRIu64 "][L%" PRIu64 "] Link offer (%d)",
"[C%"PRIu64"][L%"PRIu64"] Link offer (%d)",
hconn->conn_id, link->identity, delivery_count);
}
}
Expand All @@ -543,7 +543,7 @@ static void _core_link_drained(void *context, qdr_link_t *link)
qdr_http1_connection_t *hconn = (qdr_http1_connection_t*) qdr_link_get_context(link);
if (hconn) {
qd_log(qdr_http1_adaptor->log, QD_LOG_DEBUG,
"[C%" PRIu64 "][L%" PRIu64 "] Link drained",
"[C%"PRIu64"][L%"PRIu64"] Link drained",
hconn->conn_id, link->identity);
}
}
Expand All @@ -554,7 +554,7 @@ static void _core_link_drain(void *context, qdr_link_t *link, bool mode)
qdr_http1_connection_t *hconn = (qdr_http1_connection_t*) qdr_link_get_context(link);
if (hconn) {
qd_log(qdr_http1_adaptor->log, QD_LOG_DEBUG,
"[C%" PRIu64 "][L%" PRIu64 "] Link drain %s",
"[C%"PRIu64"][L%"PRIu64"] Link drain %s",
hconn->conn_id, link->identity,
mode ? "ON" : "OFF");
}
Expand All @@ -566,7 +566,7 @@ static int _core_link_push(void *context, qdr_link_t *link, int limit)
qdr_http1_connection_t *hconn = (qdr_http1_connection_t*) qdr_link_get_context(link);
if (hconn) {
qd_log(qdr_http1_adaptor->log, QD_LOG_DEBUG,
"[C%" PRIu64 "][L%" PRIu64 "] Link push %d", hconn->conn_id, link->identity, limit);
"[C%"PRIu64"][L%"PRIu64"] Link push %d", hconn->conn_id, link->identity, limit);
return qdr_link_process_deliveries(qdr_http1_adaptor->core, link, limit);
}
return 0;
Expand All @@ -582,7 +582,7 @@ static uint64_t _core_link_deliver(void *context, qdr_link_t *link, qdr_delivery

if (hconn) {
qd_log(qdr_http1_adaptor->log, QD_LOG_DEBUG,
"[C%" PRIu64 "][L%" PRIu64 "] Core link deliver %p %s", hconn->conn_id, link->identity,
"[C%"PRIu64"][L%"PRIu64"] Core link deliver %p %s", hconn->conn_id, link->identity,
(void*)delivery, settled ? "settled" : "unsettled");

if (hconn->type == HTTP1_CONN_SERVER)
Expand All @@ -601,7 +601,7 @@ static int _core_link_get_credit(void *context, qdr_link_t *link)
if (hconn) {
credit = (link == hconn->in_link) ? hconn->in_link_credit : hconn->out_link_credit;
qd_log(qdr_http1_adaptor->log, QD_LOG_DEBUG,
"[C%" PRIu64 "][L%" PRIu64 "] Link get credit (%d)", hconn->conn_id, link->identity, credit);
"[C%"PRIu64"][L%"PRIu64"] Link get credit (%d)", hconn->conn_id, link->identity, credit);
}

return credit;
Expand All @@ -617,7 +617,7 @@ static void _core_delivery_update(void *context, qdr_delivery_t *dlv, uint64_t d
qdr_http1_connection_t *hconn = hreq->hconn;
qdr_link_t *link = qdr_delivery_link(dlv);
qd_log(qdr_http1_adaptor->log, QD_LOG_DEBUG,
"[C%" PRIu64 "][L%" PRIu64 "] Core Delivery update disp=0x%"PRIx64" %s",
"[C%"PRIu64"][L%"PRIu64"] Core Delivery update disp=0x%"PRIx64" %s",
hconn->conn_id, link->identity, disp,
settled ? "settled" : "unsettled");

Expand All @@ -639,7 +639,7 @@ static void _core_conn_close(void *context, qdr_connection_t *conn, qdr_error_t
if (hconn) {
assert(hconn->qdr_conn == conn);
qd_log(qdr_http1_adaptor->log, QD_LOG_TRACE,
"[C%" PRIu64 "] HTTP/1.x closing connection", hconn->conn_id);
"[C%"PRIu64"] HTTP/1.x closing connection", hconn->conn_id);

char *qdr_error = error ? qdr_error_description(error) : 0;
if (hconn->type == HTTP1_CONN_SERVER)
Expand All @@ -658,7 +658,7 @@ static void _core_conn_trace(void *context, qdr_connection_t *conn, bool trace)
hconn->trace = trace;
if (trace)
qd_log(qdr_http1_adaptor->log, QD_LOG_TRACE,
"[C%" PRIu64 "] HTTP/1.x trace enabled", hconn->conn_id);
"[C%"PRIu64"] HTTP/1.x trace enabled", hconn->conn_id);
}
}

Expand Down
Loading

0 comments on commit eced3bd

Please sign in to comment.