libnvme: rename accessor functions for boolean value to 'nvme_ctrl_is_XXX'

When checking a boolean flag we should name the accessor functions
'nvme_ctrl_is_XXX' to avoid the rather awkward 'nvme_ctrl_get_XXX'.
And we should drop the duplicate functions from tree.c

Signed-off-by: Hannes Reinecke <[email protected]>

Author: hreinecke

libnvme/src/nvme/accessors.c

@@ -407,7 +407,7 @@ void nvme_ctrl_set_discovery_ctrl(struct nvme_ctrl *p, bool discovery_ctrl)
 	p->discovery_ctrl = discovery_ctrl;
 }
 
-bool nvme_ctrl_get_discovery_ctrl(const struct nvme_ctrl *p)
+bool nvme_ctrl_is_discovery_ctrl(const struct nvme_ctrl *p)
 {
 	return p->discovery_ctrl;
 }
@@ -419,7 +419,7 @@ void nvme_ctrl_set_unique_discovery_ctrl(
 	p->unique_discovery_ctrl = unique_discovery_ctrl;
 }
 
-bool nvme_ctrl_get_unique_discovery_ctrl(const struct nvme_ctrl *p)
+bool nvme_ctrl_is_unique_discovery_ctrl(const struct nvme_ctrl *p)
 {
 	return p->unique_discovery_ctrl;
 }
@@ -429,7 +429,7 @@ void nvme_ctrl_set_discovered(struct nvme_ctrl *p, bool discovered)
 	p->discovered = discovered;
 }
 
-bool nvme_ctrl_get_discovered(const struct nvme_ctrl *p)
+bool nvme_ctrl_is_discovered(const struct nvme_ctrl *p)
 {
 	return p->discovered;
 }
@@ -439,7 +439,7 @@ void nvme_ctrl_set_persistent(struct nvme_ctrl *p, bool persistent)
 	p->persistent = persistent;
 }
 
-bool nvme_ctrl_get_persistent(const struct nvme_ctrl *p)
+bool nvme_ctrl_is_persistent(const struct nvme_ctrl *p)
 {
 	return p->persistent;
 }

libnvme/src/nvme/accessors.h

@@ -558,22 +558,22 @@ void nvme_ctrl_set_host_iface(struct nvme_ctrl *p, const char *host_iface);
 const char *nvme_ctrl_get_host_iface(const struct nvme_ctrl *p);
 
 /**
- * nvme_ctrl_set_discovery_ctrl() - Set discovery_ctrl.
+ * nvme_ctrl_set_discovery_ctrl() - Set discovery flag.
  * @p: The &struct nvme_ctrl instance to update.
  * @discovery_ctrl: Value to assign to the discovery_ctrl field.
  */
 void nvme_ctrl_set_discovery_ctrl(struct nvme_ctrl *p, bool discovery_ctrl);
 
 /**
- * nvme_ctrl_get_discovery_ctrl() - Get discovery_ctrl.
+ * nvme_ctrl_is_discovery_ctrl() - Check discovery flag.
  * @p: The &struct nvme_ctrl instance to query.
  *
  * Return: The value of the discovery_ctrl field.
  */
-bool nvme_ctrl_get_discovery_ctrl(const struct nvme_ctrl *p);
+bool nvme_ctrl_is_discovery_ctrl(const struct nvme_ctrl *p);
 
 /**
- * nvme_ctrl_set_unique_discovery_ctrl() - Set unique_discovery_ctrl.
+ * nvme_ctrl_set_unique_discovery_ctrl() - Set unique_discovery flag.
  * @p: The &struct nvme_ctrl instance to update.
  * @unique_discovery_ctrl: Value to assign to the unique_discovery_ctrl field.
  */
@@ -582,42 +582,42 @@ void nvme_ctrl_set_unique_discovery_ctrl(
 		bool unique_discovery_ctrl);
 
 /**
- * nvme_ctrl_get_unique_discovery_ctrl() - Get unique_discovery_ctrl.
+ * nvme_ctrl_is_unique_discovery_ctrl() - Check unique_discovery flag.
  * @p: The &struct nvme_ctrl instance to query.
  *
  * Return: The value of the unique_discovery_ctrl field.
  */
-bool nvme_ctrl_get_unique_discovery_ctrl(const struct nvme_ctrl *p);
+bool nvme_ctrl_is_unique_discovery_ctrl(const struct nvme_ctrl *p);
 
 /**
- * nvme_ctrl_set_discovered() - Set discovered.
+ * nvme_ctrl_set_discovered() - Set discovered flag.
  * @p: The &struct nvme_ctrl instance to update.
  * @discovered: Value to assign to the discovered field.
  */
 void nvme_ctrl_set_discovered(struct nvme_ctrl *p, bool discovered);
 
 /**
- * nvme_ctrl_get_discovered() - Get discovered.
+ * nvme_ctrl_is_discovered() - Check discovered flag.
  * @p: The &struct nvme_ctrl instance to query.
  *
  * Return: The value of the discovered field.
  */
-bool nvme_ctrl_get_discovered(const struct nvme_ctrl *p);
+bool nvme_ctrl_is_discovered(const struct nvme_ctrl *p);
 
 /**
- * nvme_ctrl_set_persistent() - Set persistent.
+ * nvme_ctrl_set_persistent() - Set persistent flag.
  * @p: The &struct nvme_ctrl instance to update.
  * @persistent: Value to assign to the persistent field.
  */
 void nvme_ctrl_set_persistent(struct nvme_ctrl *p, bool persistent);
 
 /**
- * nvme_ctrl_get_persistent() - Get persistent.
+ * nvme_ctrl_is_persistent() - Check persistent flag.
  * @p: The &struct nvme_ctrl instance to query.
  *
  * Return: The value of the persistent field.
  */
-bool nvme_ctrl_get_persistent(const struct nvme_ctrl *p);
+bool nvme_ctrl_is_persistent(const struct nvme_ctrl *p);
 
 /****************************************************************************
  * Accessors for: struct nvme_subsystem

libnvme/src/nvme/accessors.ld

@@ -69,13 +69,13 @@ LIBNVME_ACCESSORS_3 {
 		nvme_ctrl_set_host_traddr;
 		nvme_ctrl_get_host_iface;
 		nvme_ctrl_set_host_iface;
-		nvme_ctrl_get_discovery_ctrl;
+		nvme_ctrl_is_discovery_ctrl;
 		nvme_ctrl_set_discovery_ctrl;
-		nvme_ctrl_get_unique_discovery_ctrl;
+		nvme_ctrl_is_unique_discovery_ctrl;
 		nvme_ctrl_set_unique_discovery_ctrl;
-		nvme_ctrl_get_discovered;
+		nvme_ctrl_is_discovered;
 		nvme_ctrl_set_discovered;
-		nvme_ctrl_get_persistent;
+		nvme_ctrl_is_persistent;
 		nvme_ctrl_set_persistent;
 		nvme_subsystem_get_name;
 		nvme_subsystem_set_name;

libnvme/src/nvme/tree.c

@@ -955,26 +955,6 @@ struct nvme_fabrics_config *nvme_ctrl_get_config(nvme_ctrl_t c)
 	return &c->cfg;
 }
 
-bool nvme_ctrl_is_discovered(nvme_ctrl_t c)
-{
-	return c->discovered;
-}
-
-bool nvme_ctrl_is_persistent(nvme_ctrl_t c)
-{
-	return c->persistent;
-}
-
-bool nvme_ctrl_is_discovery_ctrl(nvme_ctrl_t c)
-{
-	return c->discovery_ctrl;
-}
-
-bool nvme_ctrl_is_unique_discovery_ctrl(nvme_ctrl_t c)
-{
-	return c->unique_discovery_ctrl;
-}
-
 int nvme_ctrl_identify(nvme_ctrl_t c, struct nvme_id_ctrl *id)
 {
 	struct nvme_transport_handle *hdl = nvme_ctrl_get_transport_handle(c);

libnvme/src/nvme/tree.h

@@ -775,41 +775,6 @@ const char *nvme_ns_head_get_sysfs_dir(nvme_ns_head_t head);
  */
 struct nvme_fabrics_config *nvme_ctrl_get_config(nvme_ctrl_t c);
 
-/**
- * nvme_ctrl_is_discovered() - Returns the value of the 'discovered' flag
- * @c:	Controller instance
- *
- * Return: Value of the 'discovered' flag of @c
- */
-bool nvme_ctrl_is_discovered(nvme_ctrl_t c);
-
-/**
- * nvme_ctrl_is_persistent() - Returns the value of the 'persistent' flag
- * @c:	Controller instance
- *
- * Return: Value of the 'persistent' flag of @c
- */
-bool nvme_ctrl_is_persistent(nvme_ctrl_t c);
-
-/**
- * nvme_ctrl_is_discovery_ctrl() - Check the 'discovery_ctrl' flag
- * @c:	Controller to be checked
- *
- * Returns the value of the 'discovery_ctrl' flag which specifies whether
- * @c connects to a discovery subsystem.
- *
- * Return: Value of the 'discover_ctrl' flag
- */
-bool nvme_ctrl_is_discovery_ctrl(nvme_ctrl_t c);
-
-/**
- * nvme_ctrl_is_unique_discovery_ctrl() - Check the 'unique_discovery_ctrl' flag
- * @c:		Controller to be checked
- *
- * Return: Value of the 'unique_discovery_ctrl' flag
- */
-bool nvme_ctrl_is_unique_discovery_ctrl(nvme_ctrl_t c);
-
 /**
  * nvme_ctrl_identify() - Issues an 'identify controller' command
  * @c:	Controller instance