Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Marvin Scholz <epirat07-at-gmail.com@ffmpeg.org>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH 1/4] fftools/textformat: fix writing integers for mermaid
Date: Wed, 11 Jun 2025 21:57:22 +0200
Message-ID: <20250611195725.95154-1-epirat07@gmail.com> (raw)

With the previous logic, the integer writing codepath was unreachable.

Fix CID 1646948
---
 fftools/textformat/tf_mermaid.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/fftools/textformat/tf_mermaid.c b/fftools/textformat/tf_mermaid.c
index d3b9131ada..59b11811f1 100644
--- a/fftools/textformat/tf_mermaid.c
+++ b/fftools/textformat/tf_mermaid.c
@@ -604,22 +604,20 @@ static void mermaid_print_value(AVTextFormatContext *tfc, const char *key,
 
             break;
         case AV_DIAGRAMTYPE_ENTITYRELATIONSHIP:
-
-            if (!is_int && str)
             {
-                const char *col_type;
+                const char *col_type = "";
 
                 if (key[0] == '_')
                     return;
 
-                if (sec_data.section_id && !strcmp(str, sec_data.section_id))
-                    col_type = "PK";
-                else if (sec_data.dest_id && !strcmp(str, sec_data.dest_id))
-                    col_type = "FK";
-                else if (sec_data.src_id && !strcmp(str, sec_data.src_id))
-                    col_type = "FK";
-                else
-                    col_type = "";
+                if (str) {
+                    if (sec_data.section_id && !strcmp(str, sec_data.section_id))
+                        col_type = "PK";
+                    else if (sec_data.dest_id && !strcmp(str, sec_data.dest_id))
+                        col_type = "FK";
+                    else if (sec_data.src_id && !strcmp(str, sec_data.src_id))
+                        col_type = "FK";
+                }
 
                 MM_INDENT();
 
-- 
2.39.5 (Apple Git-154)

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

             reply	other threads:[~2025-06-11 19:57 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-06-11 19:57 Marvin Scholz [this message]
2025-06-11 19:57 ` [FFmpeg-devel] [PATCH 2/4] fftools/textformat: exit early in mermaid_print_value Marvin Scholz
2025-06-12  2:08   ` softworkz .
2025-06-11 19:57 ` [FFmpeg-devel] [PATCH 3/4] fftools/textformat: infer type " Marvin Scholz
2025-06-11 21:20   ` softworkz .
2025-06-12  2:19   ` softworkz .
2025-06-12 11:34     ` Marvin Scholz
2025-06-12 16:40       ` softworkz .
2025-06-11 19:57 ` [FFmpeg-devel] [PATCH 4/4] fftools/textformat: remove leftover comments " Marvin Scholz
2025-06-12  2:20   ` softworkz .
2025-06-12  2:04 ` [FFmpeg-devel] [PATCH 1/4] fftools/textformat: fix writing integers for mermaid softworkz .

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250611195725.95154-1-epirat07@gmail.com \
    --to=epirat07-at-gmail.com@ffmpeg.org \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git