diff --git a/ChangeLog b/ChangeLog index b5d5254342..4483a16e14 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-03-21 Sebastian Dröge + + * docs/gst/gstreamer-sections.txt: + * gst/gstregistrybinary.c: (gst_registry_binary_initialize_magic), + (gst_registry_binary_check_magic): + * gst/gstregistrybinary.h: + Call the version GST_MAGIC_BINARY_VERSION_STR to be more consistent + and add it to the (private part) of the docs to fix the build. + 2008-03-21 Sebastian Dröge * gst/gstregistrybinary.c: (gst_registry_binary_initialize_magic), diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt index bb5780fccc..7807ef4a2c 100644 --- a/docs/gst/gstreamer-sections.txt +++ b/docs/gst/gstreamer-sections.txt @@ -1745,6 +1745,7 @@ GST_TYPE_REGISTRY GST_MAGIC_BINARY_REGISTRY_LEN GST_MAGIC_BINARY_REGISTRY_STR +GST_MAGIC_BINARY_VERSION_STR GST_MAGIC_BINARY_VERSION_LEN gst_registry_get_type diff --git a/gst/gstregistrybinary.c b/gst/gstregistrybinary.c index bb8b6eeb7d..02b0bd3459 100644 --- a/gst/gstregistrybinary.c +++ b/gst/gstregistrybinary.c @@ -145,7 +145,7 @@ gst_registry_binary_initialize_magic (GstBinaryRegistryMagic * m) { if (!strncpy (m->magic, GST_MAGIC_BINARY_REGISTRY_STR, GST_MAGIC_BINARY_REGISTRY_LEN) - || !strncpy (m->version, GST_MAGIC_BINARY_VERSION_STRING, + || !strncpy (m->version, GST_MAGIC_BINARY_VERSION_STR, GST_MAGIC_BINARY_VERSION_LEN)) { GST_ERROR ("Failed to write magic to the registry magic structure"); return FALSE; @@ -625,10 +625,10 @@ gst_registry_binary_check_magic (gchar ** in) m->magic[1] & 0xff, m->magic[2] & 0xff, m->magic[3] & 0xff); return -1; } - if (strncmp (m->version, GST_MAGIC_BINARY_VERSION_STRING, + if (strncmp (m->version, GST_MAGIC_BINARY_VERSION_STR, GST_MAGIC_BINARY_VERSION_LEN)) { GST_WARNING ("Binary registry magic version is different : %s != %s", - GST_MAGIC_BINARY_VERSION_STRING, m->version); + GST_MAGIC_BINARY_VERSION_STR, m->version); return -2; } return 0; diff --git a/gst/gstregistrybinary.h b/gst/gstregistrybinary.h index 6b30877adf..c9c7995e75 100644 --- a/gst/gstregistrybinary.h +++ b/gst/gstregistrybinary.h @@ -51,13 +51,13 @@ #define GST_MAGIC_BINARY_REGISTRY_LEN (4) /* - * GST_MAGIC_BINARY_VERSION_STRING: + * GST_MAGIC_BINARY_VERSION_STR: * * The current version of the binary registry format. * This _must_ be updated whenever the registry format changes, * we currently use the core version where this change happened. */ -#define GST_MAGIC_BINARY_VERSION_STRING ("0.10.18") +#define GST_MAGIC_BINARY_VERSION_STR ("0.10.18") /* * GST_MAGIC_BINARY_VERSION_LEN: