To fix header/function/doc-string mismatches.
/**
* g_datalist_get_data:
- * @dl: a datalist.
- * @k: the string identifying a data element.
+ * @datalist: a datalist.
+ * @key: the string identifying a data element.
* @Returns: the data element, or %NULL if it is not found.
*
* Gets a data element, using its string identifer. This is slower than
glong g_utf8_strlen (const gchar *p,
gssize max) G_GNUC_PURE;
-gchar *g_utf8_substring (const gchar *p,
+gchar *g_utf8_substring (const gchar *str,
glong start_pos,
glong end_pos) G_GNUC_MALLOC;