summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiklas Haas <git@haasn.dev>2021-11-03 15:15:20 +0100
committerNiklas Haas <git@haasn.dev>2021-11-03 15:15:20 +0100
commit8bd0dee531e3dfbc076bc06ab9c2ea0e3b4e2419 (patch)
tree711a7721171eec477016a9d7fcfb892376b72371
parent701bd783cafa9fbe6dc5c34d8784193179a9290d (diff)
downloadmpv-8bd0dee531e3dfbc076bc06ab9c2ea0e3b4e2419.tar.bz2
mpv-8bd0dee531e3dfbc076bc06ab9c2ea0e3b4e2419.tar.xz
osdep: rename MP_UNREACHABLE
It was pointed out on IRC that the name is misleading, since the actual semantics of the macro is to assert first.
-rw-r--r--demux/demux.c2
-rw-r--r--demux/demux_mkv.c2
-rw-r--r--filters/f_lavfi.c4
-rw-r--r--filters/f_utils.c2
-rw-r--r--filters/filter.c2
-rw-r--r--misc/thread_pool.c2
-rw-r--r--options/m_config_core.c2
-rw-r--r--options/parse_configfile.c2
-rw-r--r--osdep/compiler.h4
-rw-r--r--player/command.c2
-rw-r--r--video/mp_image.c2
-rw-r--r--video/out/gpu/video.c2
-rw-r--r--video/out/placebo/utils.c14
-rw-r--r--video/repack.c2
14 files changed, 22 insertions, 22 deletions
diff --git a/demux/demux.c b/demux/demux.c
index 7e68a05c2f..f2928a5cc9 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -1506,7 +1506,7 @@ static void find_backward_restart_pos(struct demux_stream *ds)
// Or if preroll is involved, the first preroll packet.
while (ds->reader_head != target) {
if (!advance_reader_head(ds))
- MP_UNREACHABLE(); // target must be in list
+ MP_ASSERT_UNREACHABLE(); // target must be in list
}
double seek_pts;
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index ba9c934b7a..203978d08b 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -2872,7 +2872,7 @@ static int read_next_block_into_queue(demuxer_t *demuxer)
if (mkv_d->cluster_end != EBML_UINT_INVALID)
mkv_d->cluster_end += stream_tell(s);
}
- MP_UNREACHABLE();
+ MP_ASSERT_UNREACHABLE();
add_block:
index_block(demuxer, &block);
diff --git a/filters/f_lavfi.c b/filters/f_lavfi.c
index b66bc8584b..1f715e6e34 100644
--- a/filters/f_lavfi.c
+++ b/filters/f_lavfi.c
@@ -394,7 +394,7 @@ static bool init_pads(struct lavfi *c)
} else if (pad->type == MP_FRAME_VIDEO) {
dst_filter = avfilter_get_by_name("buffersink");
} else {
- MP_UNREACHABLE();
+ MP_ASSERT_UNREACHABLE();
}
if (!dst_filter)
@@ -484,7 +484,7 @@ static bool init_pads(struct lavfi *c)
params->frame_rate = av_d2q(fmt->nominal_fps, 1000000);
filter_name = "buffer";
} else {
- MP_UNREACHABLE();
+ MP_ASSERT_UNREACHABLE();
}
params->time_base = pad->timebase;
diff --git a/filters/f_utils.c b/filters/f_utils.c
index c166e2a4db..86ef106031 100644
--- a/filters/f_utils.c
+++ b/filters/f_utils.c
@@ -250,7 +250,7 @@ static void fixed_aframe_size_process(struct mp_filter *f)
int in_samples = mp_aframe_get_size(p->in);
int copy = MPMIN(in_samples, p->samples - p->out_written);
if (!mp_aframe_copy_samples(p->out, p->out_written, p->in, 0, copy))
- MP_UNREACHABLE();
+ MP_ASSERT_UNREACHABLE();
mp_aframe_skip_samples(p->in, copy);
p->out_written += copy;
}
diff --git a/filters/filter.c b/filters/filter.c
index 667925c43c..350047f975 100644
--- a/filters/filter.c
+++ b/filters/filter.c
@@ -372,7 +372,7 @@ static struct mp_pin *find_connected_end(struct mp_pin *p)
return other;
p = other->user_conn;
}
- MP_UNREACHABLE();
+ MP_ASSERT_UNREACHABLE();
}
// With p being part of a connection, create the pin_connection and set all
diff --git a/misc/thread_pool.c b/misc/thread_pool.c
index e2c7a238dd..9e47f13279 100644
--- a/misc/thread_pool.c
+++ b/misc/thread_pool.c
@@ -105,7 +105,7 @@ static void *worker_thread(void *arg)
return NULL;
}
}
- MP_UNREACHABLE();
+ MP_ASSERT_UNREACHABLE();
}
pthread_mutex_unlock(&pool->lock);
diff --git a/options/m_config_core.c b/options/m_config_core.c
index fd476a0627..4f8c462db1 100644
--- a/options/m_config_core.c
+++ b/options/m_config_core.c
@@ -879,7 +879,7 @@ void mp_read_option_raw(struct mpv_global *global, const char *name,
}
}
- MP_UNREACHABLE(); // not found
+ MP_ASSERT_UNREACHABLE(); // not found
}
static const struct m_config_group *find_group(struct mpv_global *global,
diff --git a/options/parse_configfile.c b/options/parse_configfile.c
index 1ef256989f..1d8c3d1299 100644
--- a/options/parse_configfile.c
+++ b/options/parse_configfile.c
@@ -176,7 +176,7 @@ static bstr read_file(struct mp_log *log, const char *filename)
}
size += s;
}
- MP_UNREACHABLE();
+ MP_ASSERT_UNREACHABLE();
}
// Load options and profiles from from a config file.
diff --git a/osdep/compiler.h b/osdep/compiler.h
index 471fc2ffd1..99fc8f0c25 100644
--- a/osdep/compiler.h
+++ b/osdep/compiler.h
@@ -24,9 +24,9 @@
#endif
#ifdef __GNUC__
-#define MP_UNREACHABLE() (assert(!"unreachable"), __builtin_unreachable())
+#define MP_ASSERT_UNREACHABLE() (assert(!"unreachable"), __builtin_unreachable())
#else
-#define MP_UNREACHABLE() (assert(!"unreachable"), abort())
+#define MP_ASSERT_UNREACHABLE() (assert(!"unreachable"), abort())
#endif
#endif
diff --git a/player/command.c b/player/command.c
index 6a639fd361..0b0dc71715 100644
--- a/player/command.c
+++ b/player/command.c
@@ -155,7 +155,7 @@ static void hook_remove(struct MPContext *mpctx, struct hook_handler *h)
return;
}
}
- MP_UNREACHABLE();
+ MP_ASSERT_UNREACHABLE();
}
bool mp_hook_test_completion(struct MPContext *mpctx, char *type)
diff --git a/video/mp_image.c b/video/mp_image.c
index e8d433cbfe..484108c315 100644
--- a/video/mp_image.c
+++ b/video/mp_image.c
@@ -593,7 +593,7 @@ static bool endian_swap_bytes(void *d, size_t bytes, size_t word_size)
AV_WL32(ud + x * 2, AV_RB32(ud + x * 2));
break;
default:
- MP_UNREACHABLE();
+ MP_ASSERT_UNREACHABLE();
}
return true;
diff --git a/video/out/gpu/video.c b/video/out/gpu/video.c
index 43fff511a1..add7985f78 100644
--- a/video/out/gpu/video.c
+++ b/video/out/gpu/video.c
@@ -4237,7 +4237,7 @@ static void gl_video_dr_free_buffer(void *opaque, uint8_t *data)
}
}
// not found - must not happen
- MP_UNREACHABLE();
+ MP_ASSERT_UNREACHABLE();
}
struct mp_image *gl_video_get_image(struct gl_video *p, int imgfmt, int w, int h,
diff --git a/video/out/placebo/utils.c b/video/out/placebo/utils.c
index a4bd829880..f677c20335 100644
--- a/video/out/placebo/utils.c
+++ b/video/out/placebo/utils.c
@@ -79,7 +79,7 @@ enum pl_color_primaries mp_prim_to_pl(enum mp_csp_prim prim)
case MP_CSP_PRIM_COUNT: return PL_COLOR_PRIM_COUNT;
}
- MP_UNREACHABLE();
+ MP_ASSERT_UNREACHABLE();
}
enum pl_color_transfer mp_trc_to_pl(enum mp_csp_trc trc)
@@ -104,7 +104,7 @@ enum pl_color_transfer mp_trc_to_pl(enum mp_csp_trc trc)
case MP_CSP_TRC_COUNT: return PL_COLOR_TRC_COUNT;
}
- MP_UNREACHABLE();
+ MP_ASSERT_UNREACHABLE();
}
enum pl_color_light mp_light_to_pl(enum mp_csp_light light)
@@ -118,7 +118,7 @@ enum pl_color_light mp_light_to_pl(enum mp_csp_light light)
case MP_CSP_LIGHT_COUNT: return PL_COLOR_LIGHT_COUNT;
}
- MP_UNREACHABLE();
+ MP_ASSERT_UNREACHABLE();
}
enum pl_color_system mp_csp_to_pl(enum mp_csp csp)
@@ -136,7 +136,7 @@ enum pl_color_system mp_csp_to_pl(enum mp_csp csp)
case MP_CSP_COUNT: return PL_COLOR_SYSTEM_COUNT;
}
- MP_UNREACHABLE();
+ MP_ASSERT_UNREACHABLE();
}
enum pl_color_levels mp_levels_to_pl(enum mp_csp_levels levels)
@@ -148,7 +148,7 @@ enum pl_color_levels mp_levels_to_pl(enum mp_csp_levels levels)
case MP_CSP_LEVELS_COUNT: return PL_COLOR_LEVELS_COUNT;
}
- MP_UNREACHABLE();
+ MP_ASSERT_UNREACHABLE();
}
enum pl_alpha_mode mp_alpha_to_pl(enum mp_alpha_type alpha)
@@ -161,7 +161,7 @@ enum pl_alpha_mode mp_alpha_to_pl(enum mp_alpha_type alpha)
case MP_ALPHA_PREMUL: return PL_ALPHA_PREMULTIPLIED;
}
- MP_UNREACHABLE();
+ MP_ASSERT_UNREACHABLE();
}
enum pl_chroma_location mp_chroma_to_pl(enum mp_chroma_location chroma)
@@ -174,5 +174,5 @@ enum pl_chroma_location mp_chroma_to_pl(enum mp_chroma_location chroma)
case MP_CHROMA_COUNT: return PL_CHROMA_COUNT;
}
- MP_UNREACHABLE();
+ MP_ASSERT_UNREACHABLE();
}
diff --git a/video/repack.c b/video/repack.c
index 7973208caf..d50f642cb1 100644
--- a/video/repack.c
+++ b/video/repack.c
@@ -169,7 +169,7 @@ static void swap_endian(struct mp_image *dst, int dst_x, int dst_y,
((uint32_t *)d)[x] = av_bswap32(((uint32_t *)s)[x]);
break;
default:
- MP_UNREACHABLE();
+ MP_ASSERT_UNREACHABLE();
}
}
}