gst/gstregistrybinary.c: Print error just once and with additional info.

Original commit message from CVS:
* gst/gstregistrybinary.c: (gst_registry_binary_check_magic),
(gst_registry_binary_load_feature),
(gst_registry_binary_load_plugin),
(gst_registry_binary_read_cache):
Print error just once and with additional info.

diff --git a/ChangeLog b/ChangeLog
index c32a4b31592593ff2035f6bf0119f5bb888f62f6..4d177cf5beffdc952a4582bf3d52c04fece5da1d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-07-24  Stefan Kost  <ensonic@users.sf.net>
+
+       * gst/gstregistrybinary.c: (gst_registry_binary_check_magic),
+       (gst_registry_binary_load_feature),
+       (gst_registry_binary_load_plugin),
+       (gst_registry_binary_read_cache):
+         Print error just once and with additional info.
+
 2007-07-24  Stefan Kost  <ensonic@users.sf.net>
 
        * libs/gst/base/gsttypefindhelper.c: (helper_find_peek),

diff --git a/gst/gstregistrybinary.c b/gst/gstregistrybinary.c
index 3cc9be772ad2c7bccb2b6cc7c35f9d521aa539cc..c36280f034bb33879de7ffdd00a11b4ea401718b 100644 (file)
--- a/gst/gstregistrybinary.c
+++ b/gst/gstregistrybinary.c
@@ -575,12 +575,12 @@ gst_registry_binary_check_magic (gchar ** in)
   unpack_element (*in, m, GstBinaryRegistryMagic);
 
   if (m == NULL || m->magic == NULL || m->version == NULL) {
-    GST_ERROR ("Binary registry magic structure is broken");
+    GST_WARNING ("Binary registry magic structure is broken");
     return FALSE;
   }
   if (strncmp (m->magic, GST_MAGIC_BINARY_REGISTRY_STR,
           GST_MAGIC_BINARY_REGISTRY_LEN) != 0) {
-    GST_ERROR
+    GST_WARNING
         ("Binary registry magic is different : %02x%02x%02x%02x != %02x%02x%02x%02x",
         GST_MAGIC_BINARY_REGISTRY_STR[0] & 0xff,
         GST_MAGIC_BINARY_REGISTRY_STR[1] & 0xff,
@@ -590,7 +590,7 @@ gst_registry_binary_check_magic (gchar ** in)
     return FALSE;
   }
   if (strncmp (m->version, GST_MAJORMINOR, GST_MAGIC_BINARY_VERSION_LEN)) {
-    GST_ERROR ("Binary registry magic version is different : %s != %s",
+    GST_WARNING ("Binary registry magic version is different : %s != %s",
         GST_MAJORMINOR, m->version);
     return FALSE;
   }
@@ -903,7 +903,9 @@ gst_registry_binary_read_cache (GstRegistry * registry, const char *location)
   }
   /* check if header is valid */
   if (!gst_registry_binary_check_magic (&in)) {
-    GST_ERROR ("Binary registry type not recognized (invalid magic)");
+    GST_ERROR
+        ("Binary registry type not recognized (invalid magic) for file at %s",
+        location);
     goto Error;
   }