tools:iio: rename variables

Use more appropriate/common variable names:
  * namepf instead of nameFile in iio_utils.c
  * ret instead of retval in lsiio.c

Signed-off-by: Hartmut Knaack <knaack.h@gmx.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

2 files changed, 19 insertions, 19 deletions

diff --git a/tools/iio/iio_utils.c b/tools/iio/iio_utils.c
index 4eac11ad38c4..8fb3214c70f2 100644
--- a/tools/iio/iio_utils.c
+++ b/tools/iio/iio_utils.c
@@ -561,7 +561,7 @@ int find_type_by_name(const char *name, const char *type)
         const struct dirent *ent;
         int number, numstrlen, ret;
 
-        FILE *nameFile;
+        FILE *namefp;
         DIR *dp;
         char thisname[IIO_MAX_NAME_LENGTH];
         char *filename;
@@ -607,20 +607,20 @@ int find_type_by_name(const char *name, const char *type)
                                         goto error_close_dir;
                                 }
 
-                                nameFile = fopen(filename, "r");
-                                if (!nameFile) {
+                                namefp = fopen(filename, "r");
+                                if (!namefp) {
                                         free(filename);
                                         continue;
                                 }
 
                                 free(filename);
                                 errno = 0;
-                                if (fscanf(nameFile, "%s", thisname) != 1) {
+                                if (fscanf(namefp, "%s", thisname) != 1) {
                                         ret = errno ? -errno : -ENODATA;
                                         goto error_close_dir;
                                 }
 
-                                if (fclose(nameFile)) {
+                                if (fclose(namefp)) {
                                         ret = -errno;
                                         goto error_close_dir;
                                 }
diff --git a/tools/iio/lsiio.c b/tools/iio/lsiio.c
index f5b3bd0267d5..7f432a55a6c4 100644
--- a/tools/iio/lsiio.c
+++ b/tools/iio/lsiio.c
@@ -61,16 +61,16 @@ static int dump_one_device(const char *dev_dir_name)
 {
         char name[IIO_MAX_NAME_LENGTH];
         int dev_idx;
-        int retval;
+        int ret;
 
-        retval = sscanf(dev_dir_name + strlen(iio_dir) + strlen(type_device),
-                        "%i", &dev_idx);
-        if (retval != 1)
+        ret = sscanf(dev_dir_name + strlen(iio_dir) + strlen(type_device), "%i",
+                     &dev_idx);
+        if (ret != 1)
                 return -EINVAL;
 
-        retval = read_sysfs_string("name", dev_dir_name, name);
-        if (retval)
-                return retval;
+        ret = read_sysfs_string("name", dev_dir_name, name);
+        if (ret)
+                return ret;
 
         printf("Device %03d: %s\n", dev_idx, name);
 
@@ -84,16 +84,16 @@ static int dump_one_trigger(const char *dev_dir_name)
 {
         char name[IIO_MAX_NAME_LENGTH];
         int dev_idx;
-        int retval;
+        int ret;
 
-        retval = sscanf(dev_dir_name + strlen(iio_dir) + strlen(type_trigger),
-                        "%i", &dev_idx);
-        if (retval != 1)
+        ret = sscanf(dev_dir_name + strlen(iio_dir) + strlen(type_trigger),
+                     "%i", &dev_idx);
+        if (ret != 1)
                 return -EINVAL;
 
-        retval = read_sysfs_string("name", dev_dir_name, name);
-        if (retval)
-                return retval;
+        ret = read_sysfs_string("name", dev_dir_name, name);
+        if (ret)
+                return ret;
 
         printf("Trigger %03d: %s\n", dev_idx, name);