From: Jaroslav Kysela Date: Sun, 10 May 2015 19:57:30 +0000 (+0200) Subject: global: fix uninitialized variable warnings for -Og X-Git-Tag: v4.1~29 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=339be8e4994f8a40a149dfc9a0d1ca79c31772fc;p=thirdparty%2Ftvheadend.git global: fix uninitialized variable warnings for -Og --- diff --git a/src/api/api_idnode.c b/src/api/api_idnode.c index 3765debb1..6ccea928b 100644 --- a/src/api/api_idnode.c +++ b/src/api/api_idnode.c @@ -224,7 +224,7 @@ api_idnode_load htsmsg_t *uuids, *l = NULL, *m; htsmsg_t *flist; htsmsg_field_t *f; - const char *uuid, *class; + const char *uuid = NULL, *class; /* Class based */ if ((class = htsmsg_get_str(args, "class"))) { diff --git a/src/dvr/dvr_db.c b/src/dvr/dvr_db.c index d75dadbbb..4deb9d448 100644 --- a/src/dvr/dvr_db.c +++ b/src/dvr/dvr_db.c @@ -75,8 +75,8 @@ dvr_entry_assign_broadcast(dvr_entry_t *de, epg_broadcast_t *bcast) char id[16]; if (bcast != de->de_bcast) { if (de->de_bcast) { - de->de_bcast->putref((epg_object_t*)de->de_bcast); snprintf(id, sizeof(id), "%u", de->de_bcast->id); + de->de_bcast->putref((epg_object_t*)de->de_bcast); notify_delayed(id, "epg", "dvr_delete"); de->de_bcast = NULL; } diff --git a/src/dvr/dvr_inotify.c b/src/dvr/dvr_inotify.c index ace176b5f..2c29b8d44 100644 --- a/src/dvr/dvr_inotify.c +++ b/src/dvr/dvr_inotify.c @@ -129,7 +129,7 @@ void dvr_inotify_add ( dvr_entry_t *de ) */ void dvr_inotify_del ( dvr_entry_t *de ) { - dvr_entry_t *det; + dvr_entry_t *det = NULL; dvr_inotify_entry_t *e; lock_assert(&global_lock); RB_FOREACH(e, &_inot_tree, link) { diff --git a/src/htsp_server.c b/src/htsp_server.c index 3df34b76b..313179acd 100644 --- a/src/htsp_server.c +++ b/src/htsp_server.c @@ -2628,6 +2628,8 @@ htsp_read_loop(htsp_connection_t *htsp) while(tvheadend_running) { readmsg: + reply = NULL; + if((r = htsp_read_message(htsp, &m, 0)) != 0) break; diff --git a/src/input/mpegts/linuxdvb/linuxdvb_adapter.c b/src/input/mpegts/linuxdvb/linuxdvb_adapter.c index db3e13d25..0eae9d00a 100644 --- a/src/input/mpegts/linuxdvb/linuxdvb_adapter.c +++ b/src/input/mpegts/linuxdvb/linuxdvb_adapter.c @@ -447,7 +447,7 @@ linuxdvb_adapter_del ( const char *path ) { int a; linuxdvb_frontend_t *lfe, *next; - linuxdvb_adapter_t *la; + linuxdvb_adapter_t *la = NULL; tvh_hardware_t *th; if (sscanf(path, "/dev/dvb/adapter%d", &a) == 1) { diff --git a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c index 91c2b7397..1b2020637 100644 --- a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c +++ b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c @@ -1450,7 +1450,7 @@ int linuxdvb_frontend_tune1 ( linuxdvb_frontend_t *lfe, mpegts_mux_instance_t *mmi, uint32_t freq ) { - int r, i, rep; + int r = 0, i, rep; char buf1[256], buf2[256]; lfe->mi_display_name((mpegts_input_t*)lfe, buf1, sizeof(buf1));