From 87dfd17553dece9259886192d478ee5fc2a78c58 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Tue, 8 Apr 2014 09:32:02 +0200 Subject: [PATCH] coverity: change a bit the annotations We want coverity to ignore those errors. It doesn't seem to be the case. --- src/client/lldpcli.c | 8 ++++---- src/daemon/event.c | 4 ++-- src/daemon/interfaces-linux.c | 4 ++-- src/daemon/lldpd.c | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/client/lldpcli.c b/src/client/lldpcli.c index aa30216d..bdc2c926 100644 --- a/src/client/lldpcli.c +++ b/src/client/lldpcli.c @@ -473,8 +473,8 @@ main(int argc, char *argv[]) /* Process file inputs */ while (gotinputs && !TAILQ_EMPTY(&inputs)) { - /* TAILQ_REMOVE does the right thing */ - /* coverity[use_after_free] */ + /* coverity[use_after_free] + TAILQ_REMOVE does the right thing */ struct input *first = TAILQ_FIRST(&inputs); log_debug("lldpctl", "process: %s", first->name); FILE *file = fopen(first->name, "r"); @@ -556,8 +556,8 @@ main(int argc, char *argv[]) end: while (!TAILQ_EMPTY(&inputs)) { - /* TAILQ_REMOVE does the right thing */ - /* coverity[use_after_free] */ + /* coverity[use_after_free] + TAILQ_REMOVE does the right thing */ struct input *first = TAILQ_FIRST(&inputs); TAILQ_REMOVE(&inputs, first, next); free(first->name); diff --git a/src/daemon/event.c b/src/daemon/event.c index c05a3b3e..8c5c3b4a 100644 --- a/src/daemon/event.c +++ b/src/daemon/event.c @@ -373,8 +373,8 @@ levent_ctl_accept(evutil_socket_t fd, short what, void *arg) client); bufferevent_enable(client->bev, EV_READ | EV_WRITE); log_debug("event", "new client accepted"); - /* s has been saved by bufferevent_socket_new */ - /* coverity[leaked_handle] */ + /* coverity[leaked_handle] + s has been saved by bufferevent_socket_new */ return; accept_failed: levent_ctl_free_client(client); diff --git a/src/daemon/interfaces-linux.c b/src/daemon/interfaces-linux.c index 75289784..72cf71fa 100644 --- a/src/daemon/interfaces-linux.c +++ b/src/daemon/interfaces-linux.c @@ -807,8 +807,8 @@ interfaces_update(struct lldpd *cfg) } if (levent_iface_subscribe(cfg, s) == -1) close(s); - /* s has been saved by levent_iface_subscribe */ - /* coverity[leaked_handle] */ + /* coverity[leaked_handle] + s has been saved by levent_iface_subscribe */ } end: diff --git a/src/daemon/lldpd.c b/src/daemon/lldpd.c index 83309934..76951c19 100644 --- a/src/daemon/lldpd.c +++ b/src/daemon/lldpd.c @@ -301,8 +301,8 @@ lldpd_reset_timer(struct lldpd *cfg) size_t output_len; char save[offsetof(struct lldpd_port, p_id_subtype)]; memcpy(save, port, sizeof(save)); - /* We intentionally partially memset port */ - /* coverity[suspicious_sizeof] */ + /* coverity[suspicious_sizeof] + We intentionally partially memset port */ memset(port, 0, sizeof(save)); output_len = lldpd_port_serialize(port, (void**)&output); memcpy(port, save, sizeof(save)); @@ -579,8 +579,8 @@ lldpd_decode(struct lldpd *cfg, char *frame, int s, freed with lldpd_port_cleanup() and therefore, the refcount of the chassis that was attached to it is decreased. */ - /* TAILQ_REMOVE does the right thing */ - /* coverity[use_after_free] */ + /* coverity[use_after_free] + TAILQ_REMOVE does the right thing */ i = 0; TAILQ_FOREACH(aport, &hardware->h_rports, p_entries) i++; log_debug("decode", "%d neighbors for %s", i, -- 2.39.5