[devhelp/wip/misc] DhLink: improve the docs and parameter names

[Sébastien Wilmet <swilmet src gnome org>]

commit 692452d63b892fd1125680bf97c49fd6c0fac71a
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Fri May 12 15:42:54 2017 +0200

    DhLink: improve the docs and parameter names

 src/dh-link.c |   43 ++++++++++++++++++++++++++-----------------
 src/dh-link.h |    8 ++++----
 2 files changed, 30 insertions(+), 21 deletions(-)
---
diff --git a/src/dh-link.c b/src/dh-link.c
index 0a2b6ee..e5f10e1 100644
--- a/src/dh-link.c
+++ b/src/dh-link.c
@@ -29,7 +29,7 @@
  *
  * A #DhLink represents a link to an HTML page or somewhere inside a page (with
  * an anchor) that is inside a #DhBook. The link can point to a specific symbol,
- * or a page, or the #DhBook itself.
+ * or a page, or the top-level page of the #DhBook.
  *
  * A #DhLink has a type that can be retrieved with dh_link_get_link_type().
  */
@@ -78,40 +78,48 @@ link_free (DhLink *link)
 
 /**
  * dh_link_new:
- * @type: the type of the content the link is pointing to.
- * @base: the base path of the link.
- * @id: the id of the link.
+ * @type: the #DhLinkType.
+ * @base_path: (nullable): the base path for the book, or %NULL.
+ * @book_id: (nullable): the book ID, or %NULL.
  * @name: the name of the link.
  * @book: (nullable): the book that the link is contained in, or %NULL.
- * @page: (nullable): the page that the link is contained in, or %NULL.
- * @filename: the filename.
+ * @page: (nullable): the page that the link is contained in, or %NULL. This
+ * parameter is actually broken.
+ * @relative_url: the URL relative to the book @base_path. Can contain an
+ * anchor.
  *
  * Creates a new #DhLink.
  *
+ * @base_path and @book_id must be provided only for a link of type
+ * %DH_LINK_TYPE_BOOK.
+ *
  * If @type is not a #DH_LINK_TYPE_BOOK and not a #DH_LINK_TYPE_PAGE, then the
  * @book and @page links must be provided.
  *
+ * @name and @relative_url must always be provided.
+ *
  * Returns: a new #DhLink.
  */
 DhLink *
 dh_link_new (DhLinkType   type,
-             const gchar *base,
-             const gchar *id,
+             const gchar *base_path,
+             const gchar *book_id,
              const gchar *name,
              DhLink      *book,
              DhLink      *page,
-             const gchar *filename)
+             const gchar *relative_url)
 {
         DhLink *link;
 
         g_return_val_if_fail (name != NULL, NULL);
-        g_return_val_if_fail (filename != NULL, NULL);
+        g_return_val_if_fail (relative_url != NULL, NULL);
 
         if (type == DH_LINK_TYPE_BOOK) {
-                g_return_val_if_fail (base != NULL, NULL);
-                g_return_val_if_fail (id != NULL, NULL);
+                g_return_val_if_fail (base_path != NULL, NULL);
+                g_return_val_if_fail (book_id != NULL, NULL);
         }
-        if (type != DH_LINK_TYPE_BOOK && type != DH_LINK_TYPE_PAGE) {
+        if (type != DH_LINK_TYPE_BOOK &&
+            type != DH_LINK_TYPE_PAGE) {
                 g_return_val_if_fail (book != NULL, NULL);
                 g_return_val_if_fail (page != NULL, NULL);
         }
@@ -122,12 +130,12 @@ dh_link_new (DhLinkType   type,
         link->type = type;
 
         if (type == DH_LINK_TYPE_BOOK) {
-                link->base = g_strdup (base);
-                link->id = g_strdup (id);
+                link->base = g_strdup (base_path);
+                link->id = g_strdup (book_id);
         }
 
         link->name = g_strdup (name);
-        link->filename = g_strdup (filename);
+        link->filename = g_strdup (relative_url);
 
         if (book != NULL) {
                 link->book = dh_link_ref (book);
@@ -263,7 +271,8 @@ dh_link_get_book_name (DhLink *link)
  * @link: a #DhLink.
  *
  * Returns: the name of the page that the @link is contained in.
- * Deprecated: 3.26: This function is used nowhere.
+ * Deprecated: 3.26: This function is used nowhere and is actually broken, it
+ * returns the book name.
  */
 const gchar *
 dh_link_get_page_name (DhLink *link)
diff --git a/src/dh-link.h b/src/dh-link.h
index 49db0a8..a48eaa8 100644
--- a/src/dh-link.h
+++ b/src/dh-link.h
@@ -26,7 +26,7 @@ G_BEGIN_DECLS
 
 /**
  * DhLinkType:
- * @DH_LINK_TYPE_BOOK: A book.
+ * @DH_LINK_TYPE_BOOK: The top-level page of a #DhBook.
  * @DH_LINK_TYPE_PAGE: A page.
  * @DH_LINK_TYPE_KEYWORD: Another kind of keyword.
  * @DH_LINK_TYPE_FUNCTION: A function keyword.
@@ -68,12 +68,12 @@ typedef struct _DhLink DhLink;
 
 GType        dh_link_get_type           (void);
 DhLink *     dh_link_new                (DhLinkType     type,
-                                         const gchar   *base,
-                                         const gchar   *id,
+                                         const gchar   *base_path,
+                                         const gchar   *book_id,
                                          const gchar   *name,
                                          DhLink        *book,
                                          DhLink        *page,
-                                         const gchar   *filename);
+                                         const gchar   *relative_url);
 DhLink *     dh_link_ref                (DhLink        *link);
 void         dh_link_unref              (DhLink        *link);
 gint         dh_link_compare            (gconstpointer  a,