eeshow/: move file and history access to file/

eeshow/Makefile

@@ -13,7 +13,8 @@
 NAME = eeshow
 OBJS = main.o sch-parse.o sch-render.o lib-parse.o lib-render.o \
        gui/gui.o gui/over.o gui/style.o gui/aoi.o gui/fmt-pango.o \
-       file.o git-util.o git-file.o git-hist.o delta.o \
+       file/file.o file/git-util.o file/git-file.o file/git-hist.o \
+       delta.o \
        style.o fig.o record.o cro.o diff.o gfx.o dwg.o text.o misc.o diag.o
 
 CFLAGS = -g  -Wall -Wextra -Wno-unused-parameter -Wshadow \

eeshow/diff.c

@@ -23,7 +23,7 @@
 #include "diag.h"
 #include "main.h"
 #include "cro.h"
-#include "file.h"
+#include "file/file.h"
 #include "sch.h"
 #include "lib.h"
 #include "record.h"

eeshow/file/file.c

@@ -1,5 +1,5 @@
 /*
- * file.c - Open and read a file
+ * file/file.c - Open and read a file
  *
  * Written 2016 by Werner Almesberger
  * Copyright 2016 by Werner Almesberger
@@ -18,8 +18,8 @@
 
 #include "util.h"
 #include "diag.h"
-#include "git-file.h"
+#include "file/git-file.h"
-#include "file.h"
+#include "file/file.h"
 
 
 void *file_oid(const struct file *file)

eeshow/file/file.h

@@ -1,5 +1,5 @@
 /*
- * file.h - Open and read a file
+ * file/file.h - Open and read a file
  *
  * Written 2016 by Werner Almesberger
  * Copyright 2016 by Werner Almesberger
@@ -10,8 +10,8 @@
  * (at your option) any later version.
  */
 
-#ifndef FILE_H
+#ifndef FILE_FILE_H
-#define	FILE_H
+#define	FILE_FILE_H
 
 #include <stdbool.h>
 #include <stdio.h>
@@ -42,4 +42,4 @@ bool file_read(struct file *file,
     void *user);
 void file_close(struct file *file);
 
-#endif /* !FILE_H */
+#endif /* !FILE_FILE_H */

eeshow/file/git-file.c

@@ -1,5 +1,5 @@
 /*
- * git-file.c - Open and read a file from git version control system
+ * file/git-file.c - Open and read a file from git version control system
  *
  * Written 2016 by Werner Almesberger
  * Copyright 2016 by Werner Almesberger
@@ -22,9 +22,9 @@
 
 #include "util.h"
 #include "diag.h"
-#include "file.h"
+#include "file/file.h"
-#include "git-util.h"
+#include "file/git-util.h"
-#include "git-file.h"
+#include "file/git-file.h"
 
 
 struct vcs_git {

eeshow/file/git-file.h

@@ -1,5 +1,5 @@
 /*
- * git-file.h - Open and read a file from git version control system
+ * file/git-file.h - Open and read a file from git version control system
  *
  * Written 2016 by Werner Almesberger
  * Copyright 2016 by Werner Almesberger
@@ -10,8 +10,8 @@
  * (at your option) any later version.
  */
 
-#ifndef GIT_FILE_H
+#ifndef FILE_GIT_FILE_H
-#define	GIT_FILE_H
+#define	FILE_GIT_FILE_H
 
 #include <stdbool.h>
 
@@ -42,4 +42,4 @@ bool vcs_git_read(void *ctx, struct file *file,
     void *user);
 void vcs_git_close(void *ctx);
 
-#endif /* !GIT_FILE_H */
+#endif /* !FILE_GIT_FILE_H */

eeshow/file/git-hist.c

@@ -1,5 +1,5 @@
 /*
- * git-hist.c - Retrieve revision history from GIT repo
+ * file/git-hist.c - Retrieve revision history from GIT repo
  *
  * Written 2016 by Werner Almesberger
  * Copyright 2016 by Werner Almesberger
@@ -18,9 +18,9 @@
 
 #include "util.h"
 #include "diag.h"
-#include "git-util.h"
+#include "file/git-util.h"
-#include "git-file.h"
+#include "file/git-file.h"
-#include "git-hist.h"
+#include "file/git-hist.h"
 
 
 /*

eeshow/file/git-hist.h

@@ -1,5 +1,5 @@
 /*
- * git-hist.h - Retrieve revision history from GIT repo
+ * file/git-hist.h - Retrieve revision history from GIT repo
  *
  * Written 2016 by Werner Almesberger
  * Copyright 2016 by Werner Almesberger
@@ -10,8 +10,8 @@
  * (at your option) any later version.
  */
 
-#ifndef GIT_HIST_H
+#ifndef FILE_GIT_HIST_H
-#define	GIT_HIST_H
+#define	FILE_GIT_HIST_H
 
 #include <stdbool.h>
 
@@ -41,4 +41,4 @@ void hist_iterate(struct hist *h,
     void (*fn)(void *user, struct hist *h), void *user);
 void dump_hist(struct hist *h);
 
-#endif /* !GIT_HIST_H */
+#endif /* !FILE_GIT_HIST_H */

eeshow/file/git-util.c

@@ -1,5 +1,5 @@
 /*
- * git-util.c - Git utility functions
+ * file/git-util.c - Git utility functions
  *
  * Written 2016 by Werner Almesberger
  * Copyright 2016 by Werner Almesberger
@@ -15,7 +15,7 @@
 
 #include <git2.h>
 
-#include "git-util.h"
+#include "file/git-util.h"
 
 
 /*

eeshow/file/git-util.h

@@ -1,5 +1,5 @@
 /*
- * git-util.h - Git utility functions
+ * file/git-util.h - Git utility functions
  *
  * Written 2016 by Werner Almesberger
  * Copyright 2016 by Werner Almesberger
@@ -10,8 +10,8 @@
  * (at your option) any later version.
  */
 
-#ifndef GIT_UTIL_H
+#ifndef FILE_GIT_UTIL_H
-#define	GIT_UTIL_H
+#define	FILE_GIT_UTIL_H
 
 #include <stdbool.h>
 
@@ -21,4 +21,4 @@
 bool git_repo_is_dirty(git_repository *repo);
 void git_init_once(void);
 
-#endif /* !GIT_UTIL_H */
+#endif /* !FILE_GIT_UTIL_H */

eeshow/gui/gui.c

@@ -33,7 +33,7 @@
 #include "style.h"
 #include "cro.h"
 #include "gfx.h"
-#include "git-hist.h"
+#include "file/git-hist.h"
 #include "sch.h"
 #include "delta.h"
 #include "diff.h"

eeshow/lib-parse.c

@@ -18,7 +18,7 @@
 #include "util.h"
 #include "diag.h"
 #include "text.h"
-#include "file.h"
+#include "file/file.h"
 #include "lib.h"
 
 

eeshow/lib.h

@@ -16,7 +16,7 @@
 
 #include <stdbool.h>
 
-#include "file.h"
+#include "file/file.h"
 
 
 enum lib_state {

eeshow/main.c

@@ -25,11 +25,11 @@
 #include "cro.h"
 #include "diff.h"
 #include "gfx.h"
-#include "file.h"
+#include "file/file.h"
 #include "lib.h"
 #include "sch.h"
 #include "gui/fmt-pango.h"
-#include "git-hist.h"
+#include "file/git-hist.h"
 #include "gui/gui.h"
 #include "main.h"
 

eeshow/sch-parse.c

@@ -22,7 +22,7 @@
 #include "util.h"
 #include "diag.h"
 #include "dwg.h"
-#include "file.h"
+#include "file/file.h"
 #include "lib.h"
 #include "sch.h"
 

eeshow/sch.h

@@ -18,7 +18,7 @@
 
 #include "dwg.h"
 #include "text.h"
-#include "file.h"
+#include "file/file.h"
 #include "lib.h"