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 3ef2a8ae403b655421f237b5e8e08719dbaf0753..214d4591ceafa94069a5b928db5c5e04c89df688 100644 (file)
--- 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 129a15afffee00184012db3bac376f114d959a0c..fbb4255d18da9c48eaca59bed03fb9d6266c8e60 100644 (file)
--- 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 f94b17441ae53cafa8acfac687b727b81a1bb373..a3f2529478073484f78e86b9772988c2419a6d28 100644 (file)
--- 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 5a570d26eb84529df55156606fcd29be1f35d61c..d09f78f4d3369017fbbb8bbdbbc4545724968fca 100644 (file)
--- 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));