libctf, include: ctf_set_conflicting -> ctf_type_set_conflicting

Kind-nonspecific query/set functions should be named ctf_type_*.

diff --git a/include/ctf-api.h b/include/ctf-api.h
index 950d2f74c5aed46750e6d0a07663ebc3b6d1bd1f..a3d3164fffa371c5a1ab23207be405ee135394d0 100644 (file)
--- a/include/ctf-api.h
+++ b/include/ctf-api.h
@@ -1072,7 +1072,7 @@ extern ctf_ret_t ctf_array_set_info (ctf_dict_t *, ctf_id_t, const ctf_arinfo_t
    given name.  The type is hidden from all name lookups, just like
    CTF_ADD_NONROOT.  */
 
-extern ctf_ret_t ctf_set_conflicting (ctf_dict_t *, ctf_id_t, const char *);
+extern ctf_ret_t ctf_type_set_conflicting (ctf_dict_t *, ctf_id_t, const char *);
 
 /* Add a function or object symbol type with a particular name, without saying
    anything about the actual symbol index.  (The linker will then associate them

diff --git a/libctf/ctf-create.c b/libctf/ctf-create.c
index d363bd63ae096dc2e8e22659ffcf51f888c00800..b5244405c01e6e1c25241700c7a39a7453c195b8 100644 (file)
--- a/libctf/ctf-create.c
+++ b/libctf/ctf-create.c
@@ -930,7 +930,7 @@ ctf_array_set_info (ctf_dict_t *fp, ctf_id_t type, const ctf_arinfo_t *arp)
 
 /* Set this type as conflicting in compilation unit CUNAME.  */
 ctf_ret_t
-ctf_set_conflicting (ctf_dict_t *fp, ctf_id_t type, const char *cuname)
+ctf_type_set_conflicting (ctf_dict_t *fp, ctf_id_t type, const char *cuname)
 {
   ctf_dict_t *ofp = fp;
   ctf_dtdef_t *dtd;
@@ -943,8 +943,8 @@ ctf_set_conflicting (ctf_dict_t *fp, ctf_id_t type, const char *cuname)
   idx = ctf_type_to_index (fp, type);
   dtd = ctf_dtd_lookup (fp, type);
 
-  /* You can only call ctf_set_conflicting on a type you have added, not a type
-     that was read in via ctf_open.  */
+  /* You can only call ctf_type_set_conflicting on a type you have added, not a
+     type that was read in via ctf_open.  */
   if (idx < fp->ctf_stypes)
     return (ctf_set_errno (ofp, ECTF_RDONLY));
 

diff --git a/libctf/ctf-dedup.c b/libctf/ctf-dedup.c
index 07f966bbfee91293365ac14aece87baf2e73ed36..6b5ea6bfd42cd8401fdda589bfee1f23de4f2fb3 100644 (file)
--- a/libctf/ctf-dedup.c
+++ b/libctf/ctf-dedup.c
@@ -3952,7 +3952,7 @@ ctf_dedup_emit_type (const char *hval, ctf_dict_t *output, ctf_dict_t **inputs,
   /* If this type is meant to be marked conflicting in this dict rather than
      moved into a child, mark it, and note which CU it came from.  */
   if (new_type != 0 && mark_type_conflicting)
-    if (ctf_set_conflicting (target, new_type, ctf_cuname (input)) < 0)
+    if (ctf_type_set_conflicting (target, new_type, ctf_cuname (input)) < 0)
       goto err_target;
 
   return 0;

diff --git a/libctf/libctf.ver b/libctf/libctf.ver
index 96132fb4a63a1be78c81d736950f0a41cdee2b64..c5861c53d3a70add3af7f55e3ae6f55cafadac48 100644 (file)
--- a/libctf/libctf.ver
+++ b/libctf/libctf.ver
@@ -139,7 +139,7 @@ LIBCTF_2.0 {
        ctf_add_member_bitfield;
 
        ctf_array_set_info;
-       ctf_set_conflicting;
+       ctf_type_set_conflicting;
 
        ctf_update;
        ctf_discard;