From 0bf7a4eda3535ae820dca5f1f275b6d6ca92daaa Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Thu, 16 Aug 2018 09:56:28 +0200 Subject: [PATCH] Fixed some warnings + errors --- src/capture_filter.cpp | 1 + src/hd-rum-translator/hd-rum-translator.cpp | 2 +- src/rtp/audio_decoders.cpp | 1 - src/utils/net.c | 32 +++++++++------------ src/video_capture/decklink.cpp | 3 +- src/video_capture/testcard.cpp | 2 -- src/video_frame.c | 23 ++++++++------- src/video_rxtx/rtp.cpp | 3 +- src/vo_postprocess/scale.c | 2 +- 9 files changed, 33 insertions(+), 36 deletions(-) diff --git a/src/capture_filter.cpp b/src/capture_filter.cpp index 5f3288995..64ea3dc71 100644 --- a/src/capture_filter.cpp +++ b/src/capture_filter.cpp @@ -192,6 +192,7 @@ static struct response *process_message(struct capture_filter *s, struct msg_uni if (create_filter(s, fmt) != 0) { fprintf(stderr, "Cannot create capture filter: %s.\n", msg->text); + free(fmt); return new_response(RESPONSE_INT_SERV_ERR, NULL); } else { printf("Capture filter \"%s\" created successfully.\n", diff --git a/src/hd-rum-translator/hd-rum-translator.cpp b/src/hd-rum-translator/hd-rum-translator.cpp index ea49fb974..a9270ce83 100644 --- a/src/hd-rum-translator/hd-rum-translator.cpp +++ b/src/hd-rum-translator/hd-rum-translator.cpp @@ -649,7 +649,7 @@ int main(int argc, char **argv) if (argc == 1) { usage(argv[0]); - return false; + return EXIT_FAILURE; } #ifndef WIN32 diff --git a/src/rtp/audio_decoders.cpp b/src/rtp/audio_decoders.cpp index 413fb05f0..92e45fae3 100644 --- a/src/rtp/audio_decoders.cpp +++ b/src/rtp/audio_decoders.cpp @@ -318,7 +318,6 @@ void *audio_decoder_init(char *audio_channel_map, const char *audio_scale, const error: free(tmp); audio_decoder_destroy(s); - delete s; return NULL; } diff --git a/src/utils/net.c b/src/utils/net.c index de7c1684b..83944a8a7 100644 --- a/src/utils/net.c +++ b/src/utils/net.c @@ -42,9 +42,9 @@ #endif #ifndef WIN32 +#include #include #include -#include #endif #include "utils/net.h" @@ -65,25 +65,22 @@ bool is_addr_loopback(struct sockaddr *sa) { struct sockaddr_in *sin = (struct sockaddr_in *) sa; uint32_t addr = ntohl(sin->sin_addr.s_addr); - if ((addr >> 24) == IN_LOOPBACKNET) { + if ((addr >> 24u) == IN_LOOPBACKNET) { return true; - } else { - return false; } + return false; } case AF_INET6: { struct sockaddr_in6 *sin = (struct sockaddr_in6 *) sa; if (IN6_IS_ADDR_V4MAPPED(&sin->sin6_addr)) { uint32_t v4_addr = ntohl(*((uint32_t*)(sin->sin6_addr.s6_addr + 12))); - if ((v4_addr >> 24) == IN_LOOPBACKNET) { + if ((v4_addr >> 24u) == IN_LOOPBACKNET) { return true; - } else { - return false; } - } else { - return IN6_IS_ADDR_LOOPBACK(&sin->sin6_addr); + return false; } + return IN6_IS_ADDR_LOOPBACK(&sin->sin6_addr); } default: return false; @@ -119,15 +116,14 @@ uint16_t socket_get_recv_port(int fd) if (getsockname(fd, (struct sockaddr *)&ss, &len) == -1) { perror("getsockname"); return 0; - } else { - switch (ss.ss_family) { - case AF_INET: - return ntohs(((struct sockaddr_in *) &ss)->sin_port); - case AF_INET6: - return ntohs(((struct sockaddr_in6 *) &ss)->sin6_port); - default: - return 0; - } + } + switch (ss.ss_family) { + case AF_INET: + return ntohs(((struct sockaddr_in *) &ss)->sin_port); + case AF_INET6: + return ntohs(((struct sockaddr_in6 *) &ss)->sin6_port); + default: + return 0; } } diff --git a/src/video_capture/decklink.cpp b/src/video_capture/decklink.cpp index 7c9388911..1b0f35a4d 100644 --- a/src/video_capture/decklink.cpp +++ b/src/video_capture/decklink.cpp @@ -684,7 +684,8 @@ static HRESULT set_display_mode_properties(struct vidcap_decklink_state *s, stru *pf = bmdFormat10BitYUV; break; default: - printf("Unsupported codec! %s\n", get_codec_name(s->codec)); + LOG(LOG_LEVEL_ERROR) << "Unsupported codec: " << get_codec_name(s->codec) << "!\n"; + return E_FAIL; } // get avarage time between frames BMDTimeValue frameRateDuration; diff --git a/src/video_capture/testcard.cpp b/src/video_capture/testcard.cpp index e2bdc75ff..5db6424c1 100644 --- a/src/video_capture/testcard.cpp +++ b/src/video_capture/testcard.cpp @@ -561,8 +561,6 @@ static int vidcap_testcard_init(const struct vidcap_params *params, void **state } } - tmp = filename; - vf_get_tile(s->frame, 0)->data = (char *) malloc(2 * s->size); memcpy(vf_get_tile(s->frame, 0)->data, s->data, s->size); diff --git a/src/video_frame.c b/src/video_frame.c index 28ef850d4..a81be9c33 100644 --- a/src/video_frame.c +++ b/src/video_frame.c @@ -108,18 +108,19 @@ struct video_frame * vf_alloc_desc_data(struct video_desc desc) buf = vf_alloc_desc(desc); - if(buf) { - for(unsigned int i = 0; i < desc.tile_count; ++i) { - if(codec_is_const_size(desc.color_spec)){ - buf->tiles[i].data_len = get_pf_block_size(desc.color_spec); - } else { - buf->tiles[i].data_len = vc_get_linesize(desc.width, - desc.color_spec) * - desc.height; - } - buf->tiles[i].data = (char *) malloc(buf->tiles[i].data_len); - assert(buf->tiles[i].data != NULL); + if (!buf) { + return NULL; + } + for(unsigned int i = 0; i < desc.tile_count; ++i) { + if(codec_is_const_size(desc.color_spec)){ + buf->tiles[i].data_len = get_pf_block_size(desc.color_spec); + } else { + buf->tiles[i].data_len = vc_get_linesize(desc.width, + desc.color_spec) * + desc.height; } + buf->tiles[i].data = (char *) malloc(buf->tiles[i].data_len); + assert(buf->tiles[i].data != NULL); } buf->data_deleter = vf_data_deleter; diff --git a/src/video_rxtx/rtp.cpp b/src/video_rxtx/rtp.cpp index 425fb35f8..1b79fa895 100644 --- a/src/video_rxtx/rtp.cpp +++ b/src/video_rxtx/rtp.cpp @@ -319,6 +319,7 @@ struct rtp **rtp_video_rxtx::initialize_network(const char *addrs, int recv_port devices = (struct rtp **) malloc((required_connections + 1) * sizeof(struct rtp *)); + assert(devices != nullptr); for(index = 0, addr = strtok_r(tmp, ",", &saveptr); index < required_connections; @@ -365,7 +366,7 @@ struct rtp **rtp_video_rxtx::initialize_network(const char *addrs, int recv_port rtp_done(devices[index_nest]); } free(devices); - devices = NULL; + return NULL; } } if(devices != NULL) devices[index] = NULL; diff --git a/src/vo_postprocess/scale.c b/src/vo_postprocess/scale.c index a433751f5..15a076aaf 100644 --- a/src/vo_postprocess/scale.c +++ b/src/vo_postprocess/scale.c @@ -165,7 +165,7 @@ static int scale_reconfigure(void *state, struct video_desc desc) if(s->in) { int i; for(i = 0; i < (int) s->in->tile_count; ++i) { - free(s->in->tiles[0].data); + free(s->in->tiles[i].data); } vf_free(s->in); }