From 95318e14d8677bdc7ece4afdc7c83e8635bf2074 Mon Sep 17 00:00:00 2001 From: Devaev Maxim Date: Tue, 12 May 2020 06:44:59 +0300 Subject: [PATCH] lint fixes --- src/options.c | 4 ++-- src/stream.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/options.c b/src/options.c index cb2e6ba..8736929 100644 --- a/src/options.c +++ b/src/options.c @@ -240,7 +240,7 @@ int options_parse(struct options_t *options, struct device_t *dev, struct encode # define OPT_NUMBER(_name, _dest, _min, _max, _base) { \ errno = 0; char *_end = NULL; long long _tmp = strtoll(optarg, &_end, _base); \ if (errno || *_end || _tmp < _min || _tmp > _max) { \ - printf("Invalid value for '%s=%s': min=%u, max=%u\n", _name, optarg, _min, _max); \ + printf("Invalid value for '%s=%s': min=%lld, max=%lld\n", _name, optarg, (long long)_min, (long long)_max); \ return -1; \ } \ _dest = _tmp; \ @@ -644,7 +644,7 @@ static void _help(struct device_t *dev, struct encoder_t *encoder, struct http_s printf(" --log-level ──── Verbosity level of messages from 0 (info) to 3 (debug).\n"); printf(" Enabling debugging messages can slow down the program.\n"); printf(" Available levels: 0 (info), 1 (performance), 2 (verbose), 3 (debug).\n"); - printf(" Default: %u.\n\n", log_level); + printf(" Default: %d.\n\n", log_level); printf(" --perf ───────────── Enable performance messages (same as --log-level=1). Default: disabled.\n\n"); printf(" --verbose ────────── Enable verbose messages and lower (same as --log-level=2). Default: disabled.\n\n"); printf(" --debug ──────────── Enable debug messages and lower (same as --log-level=3). Default: disabled.\n\n"); diff --git a/src/stream.c b/src/stream.c index d269a55..3df2d31 100644 --- a/src/stream.c +++ b/src/stream.c @@ -51,7 +51,7 @@ struct _worker_t { long double last_comp_time; pthread_mutex_t has_job_mutex; - int buf_index; + unsigned buf_index; atomic_bool has_job; bool job_timely; bool job_failed; @@ -489,7 +489,7 @@ static struct _worker_t *_workers_pool_wait(struct _workers_pool_t *pool) { A_COND_WAIT_TRUE(pool->free_workers, &pool->free_workers_cond, &pool->free_workers_mutex); A_MUTEX_UNLOCK(&pool->free_workers_mutex); - if (pool->oldest_worker && !atomic_load(&pool->oldest_worker->has_job) && pool->oldest_worker->buf_index >= 0) { + if (pool->oldest_worker && !atomic_load(&pool->oldest_worker->has_job)) { ready_worker = pool->oldest_worker; ready_worker->job_timely = true; pool->oldest_worker = pool->oldest_worker->order_next;