Commit 127f6414 authored by Geoff Simmons's avatar Geoff Simmons

Silence some warnings emitted by gcc and clang.

parent 36922f3d
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
static void __attribute__((__noreturn__)) static void __attribute__((__noreturn__))
VAS_Fail_default(const char *func, const char *file, int line, const char *cond, VAS_Fail_default(const char *func, const char *file, int line, const char *cond,
int err, enum vas_e type) enum vas_e type)
{ {
switch(type) { switch(type) {
case VAS_ASSERT: case VAS_ASSERT:
...@@ -69,8 +69,8 @@ VAS_Fail_default(const char *func, const char *file, int line, const char *cond, ...@@ -69,8 +69,8 @@ VAS_Fail_default(const char *func, const char *file, int line, const char *cond,
assert(0 != 0); assert(0 != 0);
break; break;
} }
if (err) if (errno)
LOG_Log(LOG_ALERT, "errno = %d (%s)", err, strerror(err)); LOG_Log(LOG_ALERT, "errno = %d (%s)", errno, strerror(errno));
abort(); abort();
} }
......
...@@ -437,8 +437,8 @@ dispatch(struct VSL_data *vsl, struct VSL_transaction * const pt[], void *priv) ...@@ -437,8 +437,8 @@ dispatch(struct VSL_data *vsl, struct VSL_transaction * const pt[], void *priv)
int status = DISPATCH_RETURN_OK, hasdata = 0, chunks = 0; int status = DISPATCH_RETURN_OK, hasdata = 0, chunks = 0;
dataentry *de = NULL; dataentry *de = NULL;
char reqend_str[REQEND_T_LEN]; char reqend_str[REQEND_T_LEN];
int32_t vxid; int32_t vxid = 0;
struct timeval latest_t = { 0 }; struct timeval latest_t = { 0, 0 };
unsigned chunks_added = 0; unsigned chunks_added = 0;
(void) priv; (void) priv;
...@@ -594,6 +594,7 @@ dispatch(struct VSL_data *vsl, struct VSL_transaction * const pt[], void *priv) ...@@ -594,6 +594,7 @@ dispatch(struct VSL_data *vsl, struct VSL_transaction * const pt[], void *priv)
} }
snprintf(reqend_str, REQEND_T_LEN, "%s=%u.%06lu", REQEND_T_VAR, snprintf(reqend_str, REQEND_T_LEN, "%s=%u.%06lu", REQEND_T_VAR,
(unsigned) latest_t.tv_sec, latest_t.tv_usec); (unsigned) latest_t.tv_sec, latest_t.tv_usec);
AN(vxid);
chunks = append(de, SLT_Timestamp, vxid, reqend_str, REQEND_T_LEN - 1); chunks = append(de, SLT_Timestamp, vxid, reqend_str, REQEND_T_LEN - 1);
if (chunks < 0) { if (chunks < 0) {
if (debug) if (debug)
......
...@@ -347,7 +347,7 @@ MQ_Send(void *priv, const char *data, unsigned len, const char *key, ...@@ -347,7 +347,7 @@ MQ_Send(void *priv, const char *data, unsigned len, const char *key,
REPLACE(payload, data); REPLACE(payload, data);
if (rd_kafka_produce(wrk->topic, RD_KAFKA_PARTITION_UA, RD_KAFKA_MSG_F_FREE, if (rd_kafka_produce(wrk->topic, RD_KAFKA_PARTITION_UA, RD_KAFKA_MSG_F_FREE,
payload, len, key, keylen, NULL) == -1) { payload, len, key, keylen, NULL) == -1) {
snprintf(wrk->errmsg, LINE_MAX, snprintf(wrk->errmsg, LINE_MAX, "%s",
rd_kafka_err2str(rd_kafka_errno2err(errno))); rd_kafka_err2str(rd_kafka_errno2err(errno)));
MQ_LOG_Log(LOG_ERR, "%s message send failure (%d): %s", MQ_LOG_Log(LOG_ERR, "%s message send failure (%d): %s",
rd_kafka_name(wrk->kafka), errno, wrk->errmsg); rd_kafka_name(wrk->kafka), errno, wrk->errmsg);
......
...@@ -97,7 +97,7 @@ saveConfig(const char * fname) ...@@ -97,7 +97,7 @@ saveConfig(const char * fname)
perror(fname); perror(fname);
return 4; return 4;
} }
fprintf(fp, getConfigContent()); fprintf(fp, "%s", getConfigContent());
fclose ( fp ); fclose ( fp );
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment