libctf: remove reference to "unconflicted link mode".

There is no such thing, and the comment makes no sense, and doesn't
match what the code is doing.  We always want to put variables in the
same dicts as the types they relate to if at all possible.

libctf/ChangeLog
2021-03-02  Nick Alcock  <nick.alcock@oracle.com>

	* ctf-link.c (ctf_link_one_variable): Remove reference to
	"unconflicted link mode".

diff --git a/libctf/ChangeLog b/libctf/ChangeLog
index 5c38c6f391bee911adb187c3ffe1eae1cd4a9c6d..e0d3f7b4b4817cf66d5bf4cbfce021544ab5a1dd 100644 (file)
--- a/libctf/ChangeLog
+++ b/libctf/ChangeLog
@@ -1,3 +1,8 @@
+2021-03-02  Nick Alcock  <nick.alcock@oracle.com>
+
+       * ctf-link.c (ctf_link_one_variable): Remove reference to
+       "unconflicted link mode".
+
 2021-03-02  Nick Alcock  <nick.alcock@oracle.com>
 
        * ctf-link.c (ctf_create_per_cu): Drop FILENAME now that it is

diff --git a/libctf/ctf-link.c b/libctf/ctf-link.c
index 5d813dbf8b3c6ae7854090912e4bb1249dc2187d..d598b7848e8c0cb5efe7885054c42c3360e5656a 100644 (file)
--- a/libctf/ctf-link.c
+++ b/libctf/ctf-link.c
@@ -499,9 +499,9 @@ ctf_link_one_variable (const char *name, ctf_id_t type, void *arg_)
        return 0;
     }
 
-  /* In unconflicted link mode, if this type is mapped to a type in the parent
-     dict, we want to try to add to that first: if it reports a duplicate,
-     or if the type is in a child already, add straight to the child.  */
+  /* If this type is mapped to a type in the parent dict, we want to try to add
+     to that first: if it reports a duplicate, or if the type is in a child
+     already, add straight to the child.  */
 
   insert_fp = arg->out_fp;