X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Famqp.c;h=467b7ff46041f76d618c0308eee50ce77cf6353e;hp=73bc1a2961e22d43dcf4b60299ba86b254588517;hb=7111bb6df7628edce3a8e538b386fbe27633a191;hpb=be126043c2be20399d7670fe194645292018bde0 diff --git a/src/amqp.c b/src/amqp.c index 73bc1a29..467b7ff4 100644 --- a/src/amqp.c +++ b/src/amqp.c @@ -218,17 +218,17 @@ static char *camqp_strerror(camqp_config_t *conf, /* {{{ */ amqp_connection_close_t *m = r.reply.decoded; char *tmp = camqp_bytes_cstring(&m->reply_text); snprintf(buffer, buffer_size, "Server connection error %d: %s", - m->reply_code, tmp); + m->reply_code, tmp); sfree(tmp); } else if (r.reply.id == AMQP_CHANNEL_CLOSE_METHOD) { amqp_channel_close_t *m = r.reply.decoded; char *tmp = camqp_bytes_cstring(&m->reply_text); snprintf(buffer, buffer_size, "Server channel error %d: %s", - m->reply_code, tmp); + m->reply_code, tmp); sfree(tmp); } else { snprintf(buffer, buffer_size, "Server error method %#" PRIx32, - r.reply.id); + r.reply.id); } break; @@ -759,8 +759,8 @@ static int camqp_write(const data_set_t *ds, const value_list_t *vl, /* {{{ */ sstrncpy(routing_key, conf->routing_key, sizeof(routing_key)); } else { snprintf(routing_key, sizeof(routing_key), "collectd/%s/%s/%s/%s/%s", - vl->host, vl->plugin, vl->plugin_instance, vl->type, - vl->type_instance); + vl->host, vl->plugin, vl->plugin_instance, vl->type, + vl->type_instance); /* Switch slashes (the only character forbidden by collectd) and dots * (the separation character used by AMQP). */