more print format fixes

Original commit message from CVS:
more print format fixes
This commit is contained in:
Thomas Vander Stichele 2005-05-02 15:31:36 +00:00
parent 8f87745592
commit e0b5b2ef7c
5 changed files with 25 additions and 14 deletions

View file

@ -1,3 +1,10 @@
2005-05-02 Thomas Vander Stichele <thomas at apestaart dot org>
reviewed by: <delete if not using a buddy>
* testsuite/indexers/cache1.c: (lookup):
* testsuite/indexers/indexdump.c: (main):
2005-05-02 Thomas Vander Stichele <thomas at apestaart dot org> 2005-05-02 Thomas Vander Stichele <thomas at apestaart dot org>
* docs/gst/tmpl/gstconfig.sgml: * docs/gst/tmpl/gstconfig.sgml:

View file

@ -33,9 +33,10 @@ lookup (GstIndex * index, GstIndexLookupMethod method,
gst_index_entry_assoc_map (entry, dest_format, &result); gst_index_entry_assoc_map (entry, dest_format, &result);
if (result == expecting) { if (result == expecting) {
g_print ("OK (%lld)\n", result); g_print ("OK (%" G_GINT64_FORMAT ")\n", result);
} else { } 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 { } else {
const GstFormatDefinition *def = gst_format_get_details (src_format); const GstFormatDefinition *def = gst_format_get_details (src_format);
@ -43,8 +44,9 @@ lookup (GstIndex * index, GstIndexLookupMethod method,
if (expecting == -1) if (expecting == -1)
g_print ("OK (not found)\n"); g_print ("OK (not found)\n");
else else
g_print ("FAIL - no index entry found for %lld %s, expecting %lld\n", g_print ("FAIL - no index entry found for %" G_GINT64_FORMAT
src_value, def->nick, expecting); " %s, expecting %" G_GINT64_FORMAT "\n", src_value, def->nick,
expecting);
} }
} }
@ -55,8 +57,7 @@ typedef struct _GstIndexTestCase
gint64 src_value; gint64 src_value;
GstFormat dest_format; GstFormat dest_format;
gint64 expecting; gint64 expecting;
} } GstIndexTestCase;
GstIndexTestCase;
const static GstIndexTestCase cases[] = { const static GstIndexTestCase cases[] = {
{GST_INDEX_LOOKUP_EXACT, GST_FORMAT_BYTES, 3, GST_FORMAT_TIME, 3000}, {GST_INDEX_LOOKUP_EXACT, GST_FORMAT_BYTES, 3, GST_FORMAT_TIME, 3000},

View file

@ -71,7 +71,8 @@ main (gint argc, gchar * argv[])
g_print (" time %.4f", g_print (" time %.4f",
GST_INDEX_ASSOC_VALUE (entry, fx) / (double) GST_SECOND); GST_INDEX_ASSOC_VALUE (entry, fx) / (double) GST_SECOND);
} else } 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"); g_print ("\n");
} }

View file

@ -33,9 +33,10 @@ lookup (GstIndex * index, GstIndexLookupMethod method,
gst_index_entry_assoc_map (entry, dest_format, &result); gst_index_entry_assoc_map (entry, dest_format, &result);
if (result == expecting) { if (result == expecting) {
g_print ("OK (%lld)\n", result); g_print ("OK (%" G_GINT64_FORMAT ")\n", result);
} else { } 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 { } else {
const GstFormatDefinition *def = gst_format_get_details (src_format); const GstFormatDefinition *def = gst_format_get_details (src_format);
@ -43,8 +44,9 @@ lookup (GstIndex * index, GstIndexLookupMethod method,
if (expecting == -1) if (expecting == -1)
g_print ("OK (not found)\n"); g_print ("OK (not found)\n");
else else
g_print ("FAIL - no index entry found for %lld %s, expecting %lld\n", g_print ("FAIL - no index entry found for %" G_GINT64_FORMAT
src_value, def->nick, expecting); " %s, expecting %" G_GINT64_FORMAT "\n", src_value, def->nick,
expecting);
} }
} }
@ -55,8 +57,7 @@ typedef struct _GstIndexTestCase
gint64 src_value; gint64 src_value;
GstFormat dest_format; GstFormat dest_format;
gint64 expecting; gint64 expecting;
} } GstIndexTestCase;
GstIndexTestCase;
const static GstIndexTestCase cases[] = { const static GstIndexTestCase cases[] = {
{GST_INDEX_LOOKUP_EXACT, GST_FORMAT_BYTES, 3, GST_FORMAT_TIME, 3000}, {GST_INDEX_LOOKUP_EXACT, GST_FORMAT_BYTES, 3, GST_FORMAT_TIME, 3000},

View file

@ -71,7 +71,8 @@ main (gint argc, gchar * argv[])
g_print (" time %.4f", g_print (" time %.4f",
GST_INDEX_ASSOC_VALUE (entry, fx) / (double) GST_SECOND); GST_INDEX_ASSOC_VALUE (entry, fx) / (double) GST_SECOND);
} else } 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"); g_print ("\n");
} }