From b36bdd325fc6a23aea442ebfdc8849b982d0bcb9 Mon Sep 17 00:00:00 2001
From: Bartosz Golaszewski <bartekgola@gmail.com>
Date: Thu, 29 Jun 2017 15:12:22 +0200
Subject: [PATCH] core: move all line-related code to line.c and remove core.c

This is the final stage of splitting the core library code into
separate files.

Signed-off-by: Bartosz Golaszewski <bartekgola@gmail.com>
---
 src/lib/Makefile.am        |  2 +-
 src/lib/{core.c => line.c} | 70 ++++++++++++++++++--------------------
 2 files changed, 34 insertions(+), 38 deletions(-)
 rename src/lib/{core.c => line.c} (99%)

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index b16e612..693b8cd 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -7,7 +7,7 @@
 #
 
 lib_LTLIBRARIES = libgpiod.la
-libgpiod_la_SOURCES = chip.c core.c iter.c misc.c simple.c
+libgpiod_la_SOURCES = chip.c iter.c line.c misc.c simple.c
 libgpiod_la_CFLAGS = -Wall -Wextra -g
 libgpiod_la_CFLAGS += -fvisibility=hidden -I$(top_srcdir)/include/
 libgpiod_la_CFLAGS += -include $(top_builddir)/config.h
diff --git a/src/lib/core.c b/src/lib/line.c
similarity index 99%
rename from src/lib/core.c
rename to src/lib/line.c
index 7550675..f0443a4 100644
--- a/src/lib/core.c
+++ b/src/lib/line.c
@@ -1,5 +1,5 @@
 /*
- * GPIO chardev utils for linux.
+ * GPIO line API for libgpiod.
  *
  * Copyright (C) 2017 Bartosz Golaszewski <bartekgola@gmail.com>
  *
@@ -10,16 +10,12 @@
 
 #include "gpiod-internal.h"
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 #include <stdint.h>
-#include <errno.h>
-#include <dirent.h>
-#include <ctype.h>
 #include <unistd.h>
-#include <sys/ioctl.h>
 #include <poll.h>
+#include <errno.h>
+#include <sys/ioctl.h>
 #include <linux/gpio.h>
 
 enum {
@@ -44,11 +40,6 @@ struct gpiod_line {
 	};
 };
 
-void line_set_offset(struct gpiod_line *line, unsigned int offset)
-{
-	line->info.line_offset = offset;
-}
-
 static int line_get_state(struct gpiod_line *line)
 {
 	return line->state;
@@ -94,6 +85,36 @@ static void line_remove_handle(struct gpiod_line *line)
 	}
 }
 
+void line_set_offset(struct gpiod_line *line, unsigned int offset)
+{
+	line->info.line_offset = offset;
+}
+
+struct gpiod_chip * gpiod_line_get_chip(struct gpiod_line *line)
+{
+	return line->chip;
+}
+
+struct gpiod_line * line_array_alloc(size_t numlines)
+{
+	return calloc(numlines, sizeof(struct gpiod_line));
+}
+
+void line_array_free(struct gpiod_line *lines)
+{
+	free(lines);
+}
+
+struct gpiod_line * line_array_member(struct gpiod_line *lines, size_t index)
+{
+	return &lines[index];
+}
+
+void line_set_chip(struct gpiod_line *line, struct gpiod_chip *chip)
+{
+	line->chip = chip;
+}
+
 unsigned int gpiod_line_offset(struct gpiod_line *line)
 {
 	return (unsigned int)line->info.line_offset;
@@ -700,28 +721,3 @@ int gpiod_line_event_read_fd(int fd, struct gpiod_line_event *event)
 
 	return 0;
 }
-
-struct gpiod_chip * gpiod_line_get_chip(struct gpiod_line *line)
-{
-	return line->chip;
-}
-
-struct gpiod_line * line_array_alloc(size_t numlines)
-{
-	return calloc(numlines, sizeof(struct gpiod_line));
-}
-
-void line_array_free(struct gpiod_line *lines)
-{
-	free(lines);
-}
-
-struct gpiod_line * line_array_member(struct gpiod_line *lines, size_t index)
-{
-	return &lines[index];
-}
-
-void line_set_chip(struct gpiod_line *line, struct gpiod_chip *chip)
-{
-	line->chip = chip;
-}
-- 
2.30.2