diff --git a/linters/tox.ini b/linters/tox.ini index 8abf8fb..c945456 100644 --- a/linters/tox.ini +++ b/linters/tox.ini @@ -9,7 +9,6 @@ changedir = /src [testenv:cppcheck] allowlist_externals = cppcheck commands = cppcheck \ - -j4 \ --force \ --std=c17 \ --error-exitcode=1 \ diff --git a/src/libs/process.h b/src/libs/process.h index 5bb16a4..e146c5b 100644 --- a/src/libs/process.h +++ b/src/libs/process.h @@ -98,7 +98,7 @@ INLINE int us_process_track_parent_death(void) { #ifdef WITH_SETPROCTITLE # pragma GCC diagnostic ignored "-Wunused-parameter" # pragma GCC diagnostic push -INLINE void us_process_set_name_prefix(int argc, char *argv[], const char *prefix) { +INLINE void us_process_set_name_prefix(int argc, const char *argv[], const char *prefix) { # pragma GCC diagnostic pop char *cmdline = NULL; diff --git a/src/ustreamer/device.c b/src/ustreamer/device.c index bab778c..6864d82 100644 --- a/src/ustreamer/device.c +++ b/src/ustreamer/device.c @@ -71,7 +71,7 @@ static int _device_query_control( us_device_s *dev, struct v4l2_queryctrl *query, const char *name, unsigned cid, bool quiet); static void _device_set_control( - us_device_s *dev, struct v4l2_queryctrl *query, + us_device_s *dev, const struct v4l2_queryctrl *query, const char *name, unsigned cid, int value, bool quiet); static const char *_format_to_string_nullable(unsigned format); @@ -843,7 +843,7 @@ static int _device_query_control( } static void _device_set_control( - us_device_s *dev, struct v4l2_queryctrl *query, + us_device_s *dev, const struct v4l2_queryctrl *query, const char *name, unsigned cid, int value, bool quiet) { if (value < query->minimum || value > query->maximum || value % query->step != 0) { diff --git a/src/ustreamer/encoder.c b/src/ustreamer/encoder.c index 5181d09..83e49e9 100644 --- a/src/ustreamer/encoder.c +++ b/src/ustreamer/encoder.c @@ -195,7 +195,7 @@ static void _worker_job_destroy(void *v_job) { static bool _worker_run_job(us_worker_s *wr) { us_encoder_job_s *job = (us_encoder_job_s *)wr->job; us_encoder_s *enc = job->enc; // Just for _ER() - us_frame_s *src = &job->hw->raw; + const us_frame_s *src = &job->hw->raw; us_frame_s *dest = job->dest; assert(_ER(type) != US_ENCODER_TYPE_UNKNOWN); diff --git a/src/ustreamer/options.c b/src/ustreamer/options.c index 86af020..52d6a36 100644 --- a/src/ustreamer/options.c +++ b/src/ustreamer/options.c @@ -233,7 +233,7 @@ static int _parse_resolution(const char *str, unsigned *width, unsigned *height, static int _check_instance_id(const char *str); static void _features(void); -static void _help(FILE *fp, us_device_s *dev, us_encoder_s *enc, us_stream_s *stream, us_server_s *server); +static void _help(FILE *fp, const us_device_s *dev, const us_encoder_s *enc, const us_stream_s *stream, const us_server_s *server); us_options_s *us_options_init(unsigned argc, char *argv[]) { @@ -586,7 +586,7 @@ static void _features(void) { # endif } -static void _help(FILE *fp, us_device_s *dev, us_encoder_s *enc, us_stream_s *stream, us_server_s *server) { +static void _help(FILE *fp, const us_device_s *dev, const us_encoder_s *enc, const us_stream_s *stream, const us_server_s *server) { # define SAY(x_msg, ...) fprintf(fp, x_msg "\n", ##__VA_ARGS__) SAY("\nuStreamer - Lightweight and fast MJPEG-HTTP streamer"); SAY("═══════════════════════════════════════════════════"); diff --git a/src/ustreamer/workers.c b/src/ustreamer/workers.c index deed7cc..85b4c04 100644 --- a/src/ustreamer/workers.c +++ b/src/ustreamer/workers.c @@ -157,7 +157,7 @@ void us_workers_pool_assign(us_workers_pool_s *pool, us_worker_s *ready_wr/*, vo US_MUTEX_UNLOCK(pool->free_workers_mutex); } -long double us_workers_pool_get_fluency_delay(us_workers_pool_s *pool, us_worker_s *ready_wr) { +long double us_workers_pool_get_fluency_delay(us_workers_pool_s *pool, const us_worker_s *ready_wr) { const long double approx_job_time = pool->approx_job_time * 0.9 + ready_wr->last_job_time * 0.1; US_LOG_VERBOSE("Correcting pool's %s approx_job_time: %.3Lf -> %.3Lf (last_job_time=%.3Lf)", diff --git a/src/ustreamer/workers.h b/src/ustreamer/workers.h index c170b45..44935cf 100644 --- a/src/ustreamer/workers.h +++ b/src/ustreamer/workers.h @@ -92,4 +92,4 @@ void us_workers_pool_destroy(us_workers_pool_s *pool); us_worker_s *us_workers_pool_wait(us_workers_pool_s *pool); void us_workers_pool_assign(us_workers_pool_s *pool, us_worker_s *ready_wr/*, void *job*/); -long double us_workers_pool_get_fluency_delay(us_workers_pool_s *pool, us_worker_s *ready_wr); +long double us_workers_pool_get_fluency_delay(us_workers_pool_s *pool, const us_worker_s *ready_wr);