From a73b09c74ed009226b9dc05ce7ee6cfe6b034e34 Mon Sep 17 00:00:00 2001 From: Richard Stanway Date: Wed, 13 Apr 2016 02:19:47 +0200 Subject: [PATCH] libobs: Remove various dead code found by static analysis Detected by Coverity Scan (CID 92178, 92171) --- libobs/obs-service.c | 13 ++----------- libobs/obs-source.c | 2 +- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/libobs/obs-service.c b/libobs/obs-service.c index b8ae719f7..c9ef6b3cf 100644 --- a/libobs/obs-service.c +++ b/libobs/obs-service.c @@ -53,17 +53,8 @@ static obs_service_t *obs_service_create_internal(const char *id, return NULL; } - if (!info) { - blog(LOG_ERROR, "Service ID '%s' not found", id); - - service->info.id = bstrdup(id); - service->owns_info_id = true; - } else { - service->info = *info; - } - - if (info) - service->context.data = service->info.create( + service->info = *info; + service->context.data = service->info.create( service->context.settings, service); if (!service->context.data) blog(LOG_ERROR, "Failed to create service '%s'!", name); diff --git a/libobs/obs-source.c b/libobs/obs-source.c index c2fcf67b1..064d9ece1 100644 --- a/libobs/obs-source.c +++ b/libobs/obs-source.c @@ -3681,7 +3681,7 @@ static inline void process_audio_source_tick(obs_source_t *source, void obs_source_audio_render(obs_source_t *source, uint32_t mixers, size_t channels, size_t sample_rate, size_t size) { - if (!source || !source->audio_output_buf[0][0]) { + if (!source->audio_output_buf[0][0]) { source->audio_pending = true; return; }