From: Bartosz Golaszewski <bartekgola@gmail.com>
Date: Tue, 10 Jan 2017 10:57:41 +0000 (+0100)
Subject: core: rename the req field of struct gpiod_line to request
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=da5537a17264711ec79dddb566527e79f9e178da;p=qemu-gpiodev%2Flibgpiod.git

core: rename the req field of struct gpiod_line to request

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

diff --git a/core.c b/core.c
index 8a2f192..bb45e29 100644
--- a/core.c
+++ b/core.c
@@ -41,7 +41,7 @@ struct gpiod_line {
 	bool up_to_date;
 	struct gpiod_chip *chip;
 	struct gpioline_info info;
-	struct gpiohandle_request *req;
+	struct gpiohandle_request *request;
 	struct gpioevent_request event;
 };
 
@@ -406,7 +406,7 @@ int gpiod_line_request_bulk(struct gpiod_line_bulk *line_bulk,
 	for (i = 0; i < line_bulk->num_lines; i++) {
 		line = line_bulk->lines[i];
 
-		line->req = req;
+		line->request = req;
 		line_set_state(line, LINE_TAKEN);
 		/*
 		 * Update line info to include the changes after the
@@ -436,13 +436,13 @@ void gpiod_line_release_bulk(struct gpiod_line_bulk *line_bulk)
 	unsigned int i;
 	int status;
 
-	close(line_bulk->lines[0]->req->fd);
-	free(line_bulk->lines[0]->req);
+	close(line_bulk->lines[0]->request->fd);
+	free(line_bulk->lines[0]->request);
 
 	for (i = 0; i < line_bulk->num_lines; i++) {
 		line = line_bulk->lines[i];
 
-		line->req = NULL;
+		line->request = NULL;
 		line_set_state(line, LINE_FREE);
 
 		status = gpiod_line_update(line);
@@ -501,7 +501,7 @@ int gpiod_line_get_value_bulk(struct gpiod_line_bulk *line_bulk, int *values)
 
 	memset(&data, 0, sizeof(data));
 
-	status = gpio_ioctl(line_bulk->lines[0]->req->fd,
+	status = gpio_ioctl(line_bulk->lines[0]->request->fd,
 			    GPIOHANDLE_GET_LINE_VALUES_IOCTL, &data);
 	if (status < 0)
 		return -1;
@@ -538,7 +538,7 @@ int gpiod_line_set_value_bulk(struct gpiod_line_bulk *line_bulk, int *values)
 	for (i = 0; i < line_bulk->num_lines; i++)
 		data.values[i] = (__u8)!!values[i];
 
-	status = gpio_ioctl(line_bulk->lines[0]->req->fd,
+	status = gpio_ioctl(line_bulk->lines[0]->request->fd,
 			    GPIOHANDLE_SET_LINE_VALUES_IOCTL, &data);
 	if (status < 0)
 		return -1;