vlc/0001-no-return-in-non-void.patch

105 lines
3.4 KiB
Diff

Index: vlc-2.2.6/modules/access/v4l2/demux.c
===================================================================
--- vlc-2.2.6.orig/modules/access/v4l2/demux.c
+++ vlc-2.2.6/modules/access/v4l2/demux.c
@@ -634,6 +634,7 @@ static void *MmapThread (void *data)
}
assert (0);
+ return NULL; /* dead code, but the compiler can't know */
}
static void *ReadThread (void *data)
@@ -696,6 +697,7 @@ static void *ReadThread (void *data)
#endif
}
assert (0);
+ return NULL; /* dead code, but the compiler can't know */
}
static int DemuxControl( demux_t *demux, int query, va_list args )
Index: vlc-2.2.6/modules/control/dbus/dbus.c
===================================================================
--- vlc-2.2.6.orig/modules/control/dbus/dbus.c
+++ vlc-2.2.6/modules/control/dbus/dbus.c
@@ -891,6 +891,7 @@ static void *Run( void *data )
vlc_restorecancel( canc );
}
assert(0);
+ return NULL; /* dead code, but the compiler can't know */
}
static void wakeup_main_loop( void *p_data )
Index: vlc-2.2.6/modules/control/motion.c
===================================================================
--- vlc-2.2.6.orig/modules/control/motion.c
+++ vlc-2.2.6/modules/control/motion.c
@@ -188,6 +188,7 @@ static void *RunIntf( void *data )
vlc_restorecancel( canc );
}
assert(0);
+ return NULL; /* dead code, but the compiler can't know */
}
#undef LOW_THRESHOLD
#undef HIGH_THRESHOLD
Index: vlc-2.2.6/modules/control/motionlib.c
===================================================================
--- vlc-2.2.6.orig/modules/control/motionlib.c
+++ vlc-2.2.6/modules/control/motionlib.c
@@ -196,6 +196,7 @@ static int GetOrientation( motion_sensor
default:
assert( 0 );
}
+ return 0; /* dead code, but the compiler can't know */
}
/*****************************************************************************
Index: vlc-2.2.6/modules/stream_out/rtp.c
===================================================================
--- vlc-2.2.6.orig/modules/stream_out/rtp.c
+++ vlc-2.2.6/modules/stream_out/rtp.c
@@ -1499,6 +1499,7 @@ static void *rtp_listen_thread( void *da
}
assert( 0 );
+ return NULL; /* dead code, but the compiler can't know */
}
Index: vlc-2.2.6/modules/visualization/visual/visual.c
===================================================================
--- vlc-2.2.6.orig/modules/visualization/visual/visual.c
+++ vlc-2.2.6/modules/visualization/visual/visual.c
@@ -382,6 +382,7 @@ static void *Thread( void *data )
vlc_restorecancel( canc );
}
assert(0);
+ return NULL;
}
static block_t *DoWork( filter_t *p_filter, block_t *p_in_buf )
Index: vlc-2.2.6/src/misc/events.c
===================================================================
--- vlc-2.2.6.orig/src/misc/events.c
+++ vlc-2.2.6/src/misc/events.c
@@ -271,6 +271,7 @@ int vlc_event_attach( vlc_event_manager_
FOREACH_END()
/* Unknown event = BUG */
assert( 0 );
+ return 0;
}
/**
Index: vlc-2.2.6/modules/demux/mp4/mp4.c
===================================================================
--- vlc-2.2.6.orig/modules/demux/mp4/mp4.c
+++ vlc-2.2.6/modules/demux/mp4/mp4.c
@@ -386,6 +386,7 @@ static void CreateTracksFromSmooBox( dem
p_track->p_es = es_out_Add( p_demux->out, &p_track->fmt );
}
}
+ return 0;
}
/*****************************************************************************