From: Bartosz Golaszewski <bartekgola@gmail.com>
Date: Tue, 17 Jan 2017 16:06:53 +0000 (+0100)
Subject: core: name the iterator functions consistently
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=577820aa054ddb68e17dfa298d261bf9d342c765;p=qemu-gpiodev%2Flibgpiod.git

core: name the iterator functions consistently

Signed-off-by: Bartosz Golaszewski <bartekgola@gmail.com>
---

diff --git a/include/gpiod.h b/include/gpiod.h
index 3ef2a8a..214d459 100644
--- a/include/gpiod.h
+++ b/include/gpiod.h
@@ -985,7 +985,7 @@ bool gpiod_chip_iter_done(struct gpiod_chip_iter *iter) GPIOD_API;
  * @return True if there was an error opening a gpiochip device file,
  *         false otherwise.
  */
-bool gpiod_chip_iter_iserr(struct gpiod_chip_iter *iter) GPIOD_API;
+bool gpiod_chip_iter_err(struct gpiod_chip_iter *iter) GPIOD_API;
 
 /**
  * @brief Get the name of the gpiochip that we failed to access.
diff --git a/src/lib/core.c b/src/lib/core.c
index 129a15a..fbb4255 100644
--- a/src/lib/core.c
+++ b/src/lib/core.c
@@ -679,7 +679,7 @@ struct gpiod_line * gpiod_line_find_by_name(const char *name)
 		return NULL;
 
 	gpiod_foreach_chip(chip_iter, chip) {
-		if (gpiod_chip_iter_iserr(chip_iter))
+		if (gpiod_chip_iter_err(chip_iter))
 			continue;
 
 		gpiod_line_iter_init(&line_iter, chip);
@@ -1086,7 +1086,7 @@ bool gpiod_chip_iter_done(struct gpiod_chip_iter *iter)
 	return iter->state == CHIP_ITER_DONE;
 }
 
-bool gpiod_chip_iter_iserr(struct gpiod_chip_iter *iter)
+bool gpiod_chip_iter_err(struct gpiod_chip_iter *iter)
 {
 	return iter->state == CHIP_ITER_ERR;
 }
diff --git a/src/tools/gpiodetect.c b/src/tools/gpiodetect.c
index f94b174..a3f2529 100644
--- a/src/tools/gpiodetect.c
+++ b/src/tools/gpiodetect.c
@@ -70,7 +70,7 @@ int main(int argc, char **argv)
 		die_perror("unable to access GPIO chips");
 
 	gpiod_foreach_chip(iter, chip) {
-		if (gpiod_chip_iter_iserr(iter))
+		if (gpiod_chip_iter_err(iter))
 			die_perror("error accessing gpiochip %s",
 				   gpiod_chip_iter_failed_chip(iter));
 
diff --git a/src/tools/gpioinfo.c b/src/tools/gpioinfo.c
index 5a570d2..d09f78f 100644
--- a/src/tools/gpioinfo.c
+++ b/src/tools/gpioinfo.c
@@ -185,7 +185,7 @@ int main(int argc, char **argv)
 			die_perror("error accessing GPIO chips");
 
 		gpiod_foreach_chip(chip_iter, chip) {
-			if (gpiod_chip_iter_iserr(chip_iter))
+			if (gpiod_chip_iter_err(chip_iter))
 				die_perror("error accessing gpiochip %s",
 				    gpiod_chip_iter_failed_chip(chip_iter));