fix printf labels, write values before rcv

Signed-off-by: Nikita Shubin <nikita.shubin@maquefel.me>

diff --git a/src/gpio-utils.c b/src/gpio-utils.c
index d1bf7e84e28740758c50d1825e85a5438a0eeea2..02c12569f8f3642854d4238ce5bb166d06bd092e 100644 (file)
--- a/src/gpio-utils.c
+++ b/src/gpio-utils.c
@@ -78,7 +78,7 @@ int gpiotools_request_line(int fd, unsigned int *lines,
        if (ret != sizeof(val)) {
                ret = -errno;
                fprintf(stderr, "Failed to issue %s (%d), %s\n",
-                               "GPIO_GET_LINE_IOCTL", ret, strerror(errno));
+                               "GPIO_V2_GET_LINE_IOCTL", ret, strerror(errno));
                goto exit;
        }
 
@@ -86,7 +86,7 @@ int gpiotools_request_line(int fd, unsigned int *lines,
        if (ret != sizeof(req)) {
                ret = -errno;
                fprintf(stderr, "Failed to write request %s (%d), %s\n",
-                           "GPIO_GET_LINE_IOCTL", ret, strerror(errno));
+                           "GPIO_V2_GET_LINE_IOCTL", ret, strerror(errno));
        }
 
        req.fd = fd;
@@ -146,15 +146,23 @@ int gpiotools_get_values(const int fd, struct gpio_v2_line_values *values)
        if (ret != sizeof(val)) {
                ret = -errno;
                fprintf(stderr, "Failed to issue %s (%d), %s\n",
-                       "GPIO_GET_LINE_IOCTL", ret, strerror(errno));
+                       "GPIO_V2_LINE_GET_VALUES_IOCTL", ret, strerror(errno));
+               goto exit;
+       }
+
+       ret = write(fd, values, sizeof(*values));
+       if (ret != sizeof(*values)) {
+               ret = -errno;
+               fprintf(stderr, "Failed to write request %s (%d), %s\n",
+                       "GPIO_V2_LINE_GET_VALUES_IOCTL", ret, strerror(errno));
                goto exit;
        }
 
        ret = recv(fd, &values, sizeof(*values), MSG_WAITALL);
        if (ret != sizeof(*values)) {
                ret = -errno;
-               fprintf(stderr, "Failed to issue %s (%d), %s\n",
-                       "GPIO_GET_LINE_IOCTL", ret, strerror(errno));
+               fprintf(stderr, "Failed to recieve %s (%d), %s\n",
+                       "GPIO_V2_LINE_GET_VALUES_IOCTL", ret, strerror(errno));
        }
 
 exit: