From patchwork Tue Aug 6 01:17:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 14259 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 48B48447D3E for ; Tue, 6 Aug 2019 04:17:45 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 18D75689A24; Tue, 6 Aug 2019 04:17:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EBF74689A0E for ; Tue, 6 Aug 2019 04:17:38 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id r1so86114944wrl.7 for ; Mon, 05 Aug 2019 18:17:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=roCRiB2PFZ4+vMx3BuXkbqR1smw337C7HaXgpne3+KA=; b=LfcNY2lPu1ZpX0XZDYTAoYbBH35CzPFNTn+BeR6qJN0xyqboCwwlgSXRlSiQhR+Cfh cXFcEzYPcj3Eoy8VmBSBqTs53WlHsinc1N105byoSguzhExdtxrE/bPRnX6DHNW5SCcx 2LUV7YDxkcNQD8XgtNoq7Tha+k6Irj0ZGplHsfcypUD0uMCoimT4o10PZ3mtGwODJ5ZS BmCRpN4EARVjA3LCrkA26ET6bwvwsBfnxBGskK+/9pvxXi3eTCa2f3E0yPJCejL/HiIv uyVgOAwYq3sTXUuAChkk71aK/9b3MpyuDoJKXQ+itLHZI/VzXXnZ0qlCANpaE+CDSiWc g6lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=roCRiB2PFZ4+vMx3BuXkbqR1smw337C7HaXgpne3+KA=; b=cxndI/0ZI+8XoAiViLlv5DkUsD0jF0nFZCrGzKde8zyRN/FoAh8PEihprDcvFXM0dd x/Bg6NJhBE1lDJiOV50+uLeP5+FAobM+mHEb4YVxHeo28bdzLbZlRKKBlCdCVsWyKfGZ l5T0y+Y3k0uSqgWAhG1e9Co6diusNdwQrGslgr+PNvwF+rFChIeCqWPco8y5Q9gEGkMV orqjJrb/y79KVB7PkkYw5Wzq+eGiHfCkJHU25RTS4Bflp6w2OFbMJDaDErq+pLc456Ut sImDStEnOuIfA1drRkLH2Rov4f/IjYtgcSRlSw1881w2sPbblw5B2TZPP1obMeoMaOB+ L0DQ== X-Gm-Message-State: APjAAAWKDxLCaVAsMcmEo8yAePS07/zj/ggrcMUmyR07BKVcajjA7cUF ytogjT4EOJ5//wOjjITMW0myE638 X-Google-Smtp-Source: APXvYqz77gIv5PgT9KVLnYghmyYNvNZxWAz36RQ+7TRHimgh+W0RXYSX2yXqW7mK9wPq7AxVHtSBcg== X-Received: by 2002:a5d:63c8:: with SMTP id c8mr744489wrw.21.1565054258096; Mon, 05 Aug 2019 18:17:38 -0700 (PDT) Received: from localhost.localdomain (ipbcc06ceb.dynamic.kabel-deutschland.de. [188.192.108.235]) by smtp.gmail.com with ESMTPSA id b8sm115978485wmh.46.2019.08.05.18.17.36 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 05 Aug 2019 18:17:37 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Aug 2019 03:17:05 +0200 Message-Id: <20190806011706.21018-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] fftools: Use right function signature and pointers X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The option tables of the various fftools (in particular ffprobe) are arrays of OptionDef; said type contains a union of a pointer to void and a function pointer of type int (*)(void *, const char *, const char *) as well as a size_t. Some entries (namely the common entry for writing a report as well as several more of ffprobe's entries) used the pointer to void to store a pointer to functions of type int (*)(const char *) or type int (*)(const char *, const char *); nevertheless, when the functions are actually called in write_option (in cmdutils.c), it is done via a pointer of the first type. There are two things wrong here: 1. Pointer to void can be converted to any pointer to incomplete or object type and back; but they are nevertheless not completely generic pointers: There is no provision in the C standard that guarantees their convertibility with function pointers. C90 lacks a generic function pointer, C99 made every function pointer a generic function pointer and still disallows the convertibility with void *. 2. The signature of the called function differs from the signature of the pointed-to type. This is undefined behaviour in C99 (given that C90 lacks a way to convert function pointers at all, it doesn't say anything about such a situation). It only works because none of the functions this patch is about make any use of their parameters at all. Therefore this commit changes the type of the relevant functions to match the type used for the call and uses the union's function pointer to store it. This is legal even in C90. Signed-off-by: Andreas Rheinhardt --- There are other places in the codebase that use a pointer to void to store a function pointer. Should they be changed or not? fftools/cmdutils.c | 2 +- fftools/cmdutils.h | 4 ++-- fftools/ffprobe.c | 26 +++++++++++++------------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 9cfbc45c2b..fdcd376b76 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -1046,7 +1046,7 @@ static int init_report(const char *env) return 0; } -int opt_report(const char *opt) +int opt_report(void *optctx, const char *opt, const char *arg) { return init_report(NULL); } diff --git a/fftools/cmdutils.h b/fftools/cmdutils.h index 6e2e0a2acb..1917510589 100644 --- a/fftools/cmdutils.h +++ b/fftools/cmdutils.h @@ -99,7 +99,7 @@ int opt_default(void *optctx, const char *opt, const char *arg); */ int opt_loglevel(void *optctx, const char *opt, const char *arg); -int opt_report(const char *opt); +int opt_report(void *optctx, const char *opt, const char *arg); int opt_max_alloc(void *optctx, const char *opt, const char *arg); @@ -236,7 +236,7 @@ void show_help_options(const OptionDef *options, const char *msg, int req_flags, { "colors", OPT_EXIT, { .func_arg = show_colors }, "show available color names" }, \ { "loglevel", HAS_ARG, { .func_arg = opt_loglevel }, "set logging level", "loglevel" }, \ { "v", HAS_ARG, { .func_arg = opt_loglevel }, "set logging level", "loglevel" }, \ - { "report", 0, { (void*)opt_report }, "generate a report" }, \ + { "report", 0, { .func_arg = opt_report }, "generate a report" }, \ { "max_alloc", HAS_ARG, { .func_arg = opt_max_alloc }, "set maximum size of a single allocated block", "bytes" }, \ { "cpuflags", HAS_ARG | OPT_EXPERT, { .func_arg = opt_cpuflags }, "force specific cpu flags", "flags" }, \ { "hide_banner", OPT_BOOL | OPT_EXPERT, {&hide_banner}, "do not show program banner", "hide_banner" }, \ diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 5aaddb0308..2380417229 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -3471,7 +3471,7 @@ static int opt_sections(void *optctx, const char *opt, const char *arg) return 0; } -static int opt_show_versions(const char *opt, const char *arg) +static int opt_show_versions(void *optctx, const char *opt, const char *arg) { mark_section_show_entries(SECTION_ID_PROGRAM_VERSION, 1, NULL); mark_section_show_entries(SECTION_ID_LIBRARY_VERSION, 1, NULL); @@ -3479,7 +3479,7 @@ static int opt_show_versions(const char *opt, const char *arg) } #define DEFINE_OPT_SHOW_SECTION(section, target_section_id) \ - static int opt_show_##section(const char *opt, const char *arg) \ + static int opt_show_##section(void *optctx, const char *opt, const char *arg) \ { \ mark_section_show_entries(SECTION_ID_##target_section_id, 1, NULL); \ return 0; \ @@ -3514,9 +3514,9 @@ static const OptionDef real_options[] = { { "sections", OPT_EXIT, {.func_arg = opt_sections}, "print sections structure and section information, and exit" }, { "show_data", OPT_BOOL, {(void*)&do_show_data}, "show packets data" }, { "show_data_hash", OPT_STRING | HAS_ARG, {(void*)&show_data_hash}, "show packets data hash" }, - { "show_error", 0, {(void*)&opt_show_error}, "show probing error" }, - { "show_format", 0, {(void*)&opt_show_format}, "show format/container info" }, - { "show_frames", 0, {(void*)&opt_show_frames}, "show frames info" }, + { "show_error", 0, { .func_arg = &opt_show_error }, "show probing error" }, + { "show_format", 0, { .func_arg = &opt_show_format }, "show format/container info" }, + { "show_frames", 0, { .func_arg = &opt_show_frames }, "show frames info" }, { "show_format_entry", HAS_ARG, {.func_arg = opt_show_format_entry}, "show a particular entry from the format/container info", "entry" }, { "show_entries", HAS_ARG, {.func_arg = opt_show_entries}, @@ -3524,16 +3524,16 @@ static const OptionDef real_options[] = { #if HAVE_THREADS { "show_log", OPT_INT|HAS_ARG, {(void*)&do_show_log}, "show log" }, #endif - { "show_packets", 0, {(void*)&opt_show_packets}, "show packets info" }, - { "show_programs", 0, {(void*)&opt_show_programs}, "show programs info" }, - { "show_streams", 0, {(void*)&opt_show_streams}, "show streams info" }, - { "show_chapters", 0, {(void*)&opt_show_chapters}, "show chapters info" }, + { "show_packets", 0, { .func_arg = &opt_show_packets }, "show packets info" }, + { "show_programs", 0, { .func_arg = &opt_show_programs }, "show programs info" }, + { "show_streams", 0, { .func_arg = &opt_show_streams }, "show streams info" }, + { "show_chapters", 0, { .func_arg = &opt_show_chapters }, "show chapters info" }, { "count_frames", OPT_BOOL, {(void*)&do_count_frames}, "count the number of frames per stream" }, { "count_packets", OPT_BOOL, {(void*)&do_count_packets}, "count the number of packets per stream" }, - { "show_program_version", 0, {(void*)&opt_show_program_version}, "show ffprobe version" }, - { "show_library_versions", 0, {(void*)&opt_show_library_versions}, "show library versions" }, - { "show_versions", 0, {(void*)&opt_show_versions}, "show program and library versions" }, - { "show_pixel_formats", 0, {(void*)&opt_show_pixel_formats}, "show pixel format descriptions" }, + { "show_program_version", 0, { .func_arg = &opt_show_program_version }, "show ffprobe version" }, + { "show_library_versions", 0, { .func_arg = &opt_show_library_versions }, "show library versions" }, + { "show_versions", 0, { .func_arg = &opt_show_versions }, "show program and library versions" }, + { "show_pixel_formats", 0, { .func_arg = &opt_show_pixel_formats }, "show pixel format descriptions" }, { "show_private_data", OPT_BOOL, {(void*)&show_private_data}, "show private data" }, { "private", OPT_BOOL, {(void*)&show_private_data}, "same as show_private_data" }, { "bitexact", OPT_BOOL, {&do_bitexact}, "force bitexact output" },