From 6a74ebc34dd3875ce8ea672c33aec5c2538eaaaf Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Wed, 19 Mar 2014 00:09:22 +0100 Subject: [PATCH] float-dsp-test: do not use C99's predefined __func__ It is not supported by all compilers on FATE. Fixes "some test were skipped" errors. --- libavutil/float_dsp.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libavutil/float_dsp.c b/libavutil/float_dsp.c index 03c8c11021..6ff7e2f508 100644 --- a/libavutil/float_dsp.c +++ b/libavutil/float_dsp.c @@ -216,7 +216,7 @@ static int test_vector_fmul(AVFloatDSPContext *fdsp, AVFloatDSPContext *cdsp, fdsp->vector_fmul(odst, v1, v2, LEN); if (ret = compare_floats(cdst, odst, LEN, FLT_EPSILON)) - av_log(NULL, AV_LOG_ERROR, "%s failed\n", __func__); + av_log(NULL, AV_LOG_ERROR, "vector_fmul failed\n"); return ret; } @@ -236,7 +236,7 @@ static int test_vector_fmac_scalar(AVFloatDSPContext *fdsp, AVFloatDSPContext *c fdsp->vector_fmac_scalar(odst, src0, scale, LEN); if (ret = compare_floats(cdst, odst, LEN, ARBITRARY_FMAC_SCALAR_CONST)) - av_log(NULL, AV_LOG_ERROR, "%s failed\n", __func__); + av_log(NULL, AV_LOG_ERROR, "vector_fmac_scalar failed\n"); return ret; } @@ -252,7 +252,7 @@ static int test_vector_fmul_scalar(AVFloatDSPContext *fdsp, AVFloatDSPContext *c fdsp->vector_fmul_scalar(odst, v1, scale, LEN); if (ret = compare_floats(cdst, odst, LEN, FLT_EPSILON)) - av_log(NULL, AV_LOG_ERROR, "%s failed\n", __func__); + av_log(NULL, AV_LOG_ERROR, "vector_fmul_scalar failed\n"); return ret; } @@ -268,7 +268,7 @@ static int test_vector_dmul_scalar(AVFloatDSPContext *fdsp, AVFloatDSPContext *c fdsp->vector_dmul_scalar(odst, v1, scale, LEN); if (ret = compare_doubles(cdst, odst, LEN, DBL_EPSILON)) - av_log(NULL, AV_LOG_ERROR, "%s failed\n", __func__); + av_log(NULL, AV_LOG_ERROR, "vector_dmul_scalar failed\n"); return ret; } @@ -285,7 +285,7 @@ static int test_vector_fmul_window(AVFloatDSPContext *fdsp, AVFloatDSPContext *c fdsp->vector_fmul_window(odst, v1, v2, v3, LEN / 2); if (ret = compare_floats(cdst, odst, LEN, ARBITRARY_FMUL_WINDOW_CONST)) - av_log(NULL, AV_LOG_ERROR, "%s failed\n", __func__); + av_log(NULL, AV_LOG_ERROR, "vector_fmul_window failed\n"); return ret; } @@ -302,7 +302,7 @@ static int test_vector_fmul_add(AVFloatDSPContext *fdsp, AVFloatDSPContext *cdsp fdsp->vector_fmul_add(odst, v1, v2, v3, LEN); if (ret = compare_floats(cdst, odst, LEN, ARBITRARY_FMUL_ADD_CONST)) - av_log(NULL, AV_LOG_ERROR, "%s failed\n", __func__); + av_log(NULL, AV_LOG_ERROR, "vector_fmul_add failed\n"); return ret; } @@ -318,7 +318,7 @@ static int test_vector_fmul_reverse(AVFloatDSPContext *fdsp, AVFloatDSPContext * fdsp->vector_fmul_reverse(odst, v1, v2, LEN); if (ret = compare_floats(cdst, odst, LEN, FLT_EPSILON)) - av_log(NULL, AV_LOG_ERROR, "%s failed\n", __func__); + av_log(NULL, AV_LOG_ERROR, "vector_fmul_reverse failed\n"); return ret; } @@ -342,7 +342,7 @@ static int test_butterflies_float(AVFloatDSPContext *fdsp, AVFloatDSPContext *cd if ((ret = compare_floats(cv1, ov1, LEN, FLT_EPSILON)) || (ret = compare_floats(cv2, ov2, LEN, FLT_EPSILON))) - av_log(NULL, AV_LOG_ERROR, "%s failed\n", __func__); + av_log(NULL, AV_LOG_ERROR, "butterflies_float failed\n"); return ret; } @@ -358,7 +358,7 @@ static int test_scalarproduct_float(AVFloatDSPContext *fdsp, AVFloatDSPContext * oprod = fdsp->scalarproduct_float(v1, v2, LEN); if (ret = compare_floats(&cprod, &oprod, 1, ARBITRARY_SCALARPRODUCT_CONST)) - av_log(NULL, AV_LOG_ERROR, "%s failed\n", __func__); + av_log(NULL, AV_LOG_ERROR, "scalarproduct_float failed\n"); return ret; }