diff --git a/src/device.c b/src/device.c index 6842e3e..86fc356 100644 --- a/src/device.c +++ b/src/device.c @@ -663,6 +663,7 @@ static void _device_apply_controls(struct device_t *dev) { } static int _device_query_control(struct device_t *dev, struct v4l2_queryctrl *query, const char *name, unsigned cid, bool quiet) { + // cppcheck-suppress redundantPointerOp MEMSET_ZERO(*query); query->id = cid; diff --git a/src/encoder.c b/src/encoder.c index 12375dc..b7431dd 100644 --- a/src/encoder.c +++ b/src/encoder.c @@ -170,6 +170,7 @@ void encoder_prepare(struct encoder_t *encoder, struct device_t *dev) { # pragma GCC diagnostic ignored "-Wunused-label" # pragma GCC diagnostic push + // cppcheck-suppress unusedLabel force_cpu: cpu_forced = true; # pragma GCC diagnostic pop @@ -225,6 +226,7 @@ int encoder_compress_buffer(struct encoder_t *encoder, struct device_t *dev, uns # pragma GCC diagnostic ignored "-Wunused-label" # pragma GCC diagnostic push + // cppcheck-suppress unusedLabel error: LOG_INFO("Error while compressing buffer, falling back to CPU"); A_MUTEX_LOCK(&encoder->run->mutex); diff --git a/src/encoders/omx/component.c b/src/encoders/omx/component.c index 916fd84..612e04e 100644 --- a/src/encoders/omx/component.c +++ b/src/encoders/omx/component.c @@ -61,6 +61,7 @@ int component_disable_port(OMX_HANDLETYPE *component, OMX_U32 port) { int component_get_portdef(OMX_HANDLETYPE *component, OMX_PARAM_PORTDEFINITIONTYPE *portdef, OMX_U32 port) { OMX_ERRORTYPE error; + // cppcheck-suppress redundantPointerOp OMX_INIT_STRUCTURE(*portdef); portdef->nPortIndex = port; diff --git a/src/encoders/omx/formatters.c b/src/encoders/omx/formatters.c index fea7004..353fa46 100644 --- a/src/encoders/omx/formatters.c +++ b/src/encoders/omx/formatters.c @@ -76,6 +76,7 @@ const char *omx_state_to_string(OMX_STATETYPE state) { CASE_TO_STRING(OMX_StateLoaded); CASE_TO_STRING(OMX_StateIdle); CASE_TO_STRING(OMX_StateExecuting); + // cppcheck-suppress constArgument CASE_ASSERT("Unsupported OMX state", state); } } diff --git a/src/http/server.c b/src/http/server.c index 95fdd6d..eea8c07 100644 --- a/src/http/server.c +++ b/src/http/server.c @@ -722,8 +722,6 @@ static void _http_queue_send_stream(struct http_server_t *server, bool stream_up struct bufferevent *buf_event; long long now; bool queued = false; - static unsigned queued_fps_accum = 0; - static long long queued_fps_second = 0; for (struct stream_client_t *client = server->run->stream_clients; client != NULL; client = client->next) { conn = evhttp_request_get_connection(client->request); @@ -757,6 +755,9 @@ static void _http_queue_send_stream(struct http_server_t *server, bool stream_up } if (queued) { + static unsigned queued_fps_accum = 0; + static long long queued_fps_second = 0; + if ((now = floor_ms(get_now_monotonic())) != queued_fps_second) { server->run->exposed->queued_fps = queued_fps_accum; queued_fps_accum = 0; diff --git a/src/process.h b/src/process.h index bfcc92f..6d1033c 100644 --- a/src/process.h +++ b/src/process.h @@ -105,13 +105,12 @@ INLINE void process_set_name_prefix(int argc, char *argv[], const char *prefix) char *cmdline = NULL; size_t allocated = 2048; size_t used = 0; - size_t arg_len = 0; A_REALLOC(cmdline, allocated); cmdline[0] = '\0'; for (int index = 0; index < argc; ++index) { - arg_len = strlen(argv[index]); + size_t arg_len = strlen(argv[index]); if (used + arg_len + 16 >= allocated) { allocated += arg_len + 2048; A_REALLOC(cmdline, allocated);