From e0b5b2ef7c2f5602af18b714ca7946f08e576348 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Mon, 2 May 2005 15:31:36 +0000 Subject: [PATCH] more print format fixes Original commit message from CVS: more print format fixes --- ChangeLog | 7 +++++++ tests/old/testsuite/indexers/cache1.c | 13 +++++++------ tests/old/testsuite/indexers/indexdump.c | 3 ++- testsuite/indexers/cache1.c | 13 +++++++------ testsuite/indexers/indexdump.c | 3 ++- 5 files changed, 25 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index b34dbcf..498ad9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2005-05-02 Thomas Vander Stichele + reviewed by: + + * testsuite/indexers/cache1.c: (lookup): + * testsuite/indexers/indexdump.c: (main): + +2005-05-02 Thomas Vander Stichele + * docs/gst/tmpl/gstconfig.sgml: * gst/gstconfig.h.in: move documentation for some symbols. Add doc for GST_PTR_FORMAT diff --git a/tests/old/testsuite/indexers/cache1.c b/tests/old/testsuite/indexers/cache1.c index e61d9d5..cd04851 100644 --- a/tests/old/testsuite/indexers/cache1.c +++ b/tests/old/testsuite/indexers/cache1.c @@ -33,9 +33,10 @@ lookup (GstIndex * index, GstIndexLookupMethod method, gst_index_entry_assoc_map (entry, dest_format, &result); if (result == expecting) { - g_print ("OK (%lld)\n", result); + g_print ("OK (%" G_GINT64_FORMAT ")\n", result); } else { - g_print ("FAIL - expecting %lld, got %lld\n", expecting, result); + g_print ("FAIL - expecting %" G_GINT64_FORMAT ", got %" G_GINT64_FORMAT + "\n", expecting, result); } } else { const GstFormatDefinition *def = gst_format_get_details (src_format); @@ -43,8 +44,9 @@ lookup (GstIndex * index, GstIndexLookupMethod method, if (expecting == -1) g_print ("OK (not found)\n"); else - g_print ("FAIL - no index entry found for %lld %s, expecting %lld\n", - src_value, def->nick, expecting); + g_print ("FAIL - no index entry found for %" G_GINT64_FORMAT + " %s, expecting %" G_GINT64_FORMAT "\n", src_value, def->nick, + expecting); } } @@ -55,8 +57,7 @@ typedef struct _GstIndexTestCase gint64 src_value; GstFormat dest_format; gint64 expecting; -} -GstIndexTestCase; +} GstIndexTestCase; const static GstIndexTestCase cases[] = { {GST_INDEX_LOOKUP_EXACT, GST_FORMAT_BYTES, 3, GST_FORMAT_TIME, 3000}, diff --git a/tests/old/testsuite/indexers/indexdump.c b/tests/old/testsuite/indexers/indexdump.c index ba846b2..a8c4896 100644 --- a/tests/old/testsuite/indexers/indexdump.c +++ b/tests/old/testsuite/indexers/indexdump.c @@ -71,7 +71,8 @@ main (gint argc, gchar * argv[]) g_print (" time %.4f", GST_INDEX_ASSOC_VALUE (entry, fx) / (double) GST_SECOND); } else - g_print (" %s %lld", def->nick, GST_INDEX_ASSOC_VALUE (entry, fx)); + g_print (" %s %" G_GINT64_FORMAT, def->nick, + GST_INDEX_ASSOC_VALUE (entry, fx)); } g_print ("\n"); } diff --git a/testsuite/indexers/cache1.c b/testsuite/indexers/cache1.c index e61d9d5..cd04851 100644 --- a/testsuite/indexers/cache1.c +++ b/testsuite/indexers/cache1.c @@ -33,9 +33,10 @@ lookup (GstIndex * index, GstIndexLookupMethod method, gst_index_entry_assoc_map (entry, dest_format, &result); if (result == expecting) { - g_print ("OK (%lld)\n", result); + g_print ("OK (%" G_GINT64_FORMAT ")\n", result); } else { - g_print ("FAIL - expecting %lld, got %lld\n", expecting, result); + g_print ("FAIL - expecting %" G_GINT64_FORMAT ", got %" G_GINT64_FORMAT + "\n", expecting, result); } } else { const GstFormatDefinition *def = gst_format_get_details (src_format); @@ -43,8 +44,9 @@ lookup (GstIndex * index, GstIndexLookupMethod method, if (expecting == -1) g_print ("OK (not found)\n"); else - g_print ("FAIL - no index entry found for %lld %s, expecting %lld\n", - src_value, def->nick, expecting); + g_print ("FAIL - no index entry found for %" G_GINT64_FORMAT + " %s, expecting %" G_GINT64_FORMAT "\n", src_value, def->nick, + expecting); } } @@ -55,8 +57,7 @@ typedef struct _GstIndexTestCase gint64 src_value; GstFormat dest_format; gint64 expecting; -} -GstIndexTestCase; +} GstIndexTestCase; const static GstIndexTestCase cases[] = { {GST_INDEX_LOOKUP_EXACT, GST_FORMAT_BYTES, 3, GST_FORMAT_TIME, 3000}, diff --git a/testsuite/indexers/indexdump.c b/testsuite/indexers/indexdump.c index ba846b2..a8c4896 100644 --- a/testsuite/indexers/indexdump.c +++ b/testsuite/indexers/indexdump.c @@ -71,7 +71,8 @@ main (gint argc, gchar * argv[]) g_print (" time %.4f", GST_INDEX_ASSOC_VALUE (entry, fx) / (double) GST_SECOND); } else - g_print (" %s %lld", def->nick, GST_INDEX_ASSOC_VALUE (entry, fx)); + g_print (" %s %" G_GINT64_FORMAT, def->nick, + GST_INDEX_ASSOC_VALUE (entry, fx)); } g_print ("\n"); } -- 2.7.4