eeshow/: util.h and diag.c go to misc/

eeshow/Makefile

@@ -18,7 +18,7 @@ OBJS = main.o \
        file/file.o file/git-util.o file/git-file.o file/git-hist.o \
        gfx/style.o gfx/fig.o gfx/record.o gfx/cro.o gfx/diff.o gfx/gfx.o \
        gfx/text.o gfx/misc.o \
-       diag.o
+       misc/diag.o
 
 CFLAGS = -g  -Wall -Wextra -Wno-unused-parameter -Wshadow \
 	 -Wmissing-prototypes -Wmissing-declarations \

eeshow/file/file.c

@@ -16,8 +16,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "util.h"
+#include "misc/util.h"
-#include "diag.h"
+#include "misc/diag.h"
 #include "file/git-file.h"
 #include "file/file.h"
 

eeshow/file/git-file.c

@@ -20,8 +20,8 @@
 
 #include <git2.h>
 
-#include "util.h"
+#include "misc/util.h"
-#include "diag.h"
+#include "misc/diag.h"
 #include "file/file.h"
 #include "file/git-util.h"
 #include "file/git-file.h"

eeshow/file/git-hist.c

@@ -16,8 +16,8 @@
 #include <time.h>	/* for vcs_long_for_pango */
 #include <alloca.h>
 
-#include "util.h"
+#include "misc/util.h"
-#include "diag.h"
+#include "misc/diag.h"
 #include "file/git-util.h"
 #include "file/git-file.h"
 #include "file/git-hist.h"

eeshow/gfx/cro.c

@@ -22,8 +22,8 @@
 #include <cairo/cairo.h>
 #include <cairo/cairo-pdf.h>
 
-#include "util.h"
+#include "misc/util.h"
-#include "diag.h"
+#include "misc/diag.h"
 #include "gfx/style.h"
 #include "gfx/text.h"
 #include "gfx/gfx.h"

eeshow/gfx/diff.c

@@ -19,8 +19,8 @@
 
 #include <cairo/cairo.h>
 
-#include "util.h"
+#include "misc/util.h"
-#include "diag.h"
+#include "misc/diag.h"
 #include "main.h"
 #include "gfx/cro.h"
 #include "file/file.h"

eeshow/gfx/fig.c

@@ -19,8 +19,8 @@
 #include <math.h>
 #include <assert.h>
 
-#include "util.h"
+#include "misc/util.h"
-#include "diag.h"
+#include "misc/diag.h"
 #include "gfx/style.h"
 #include "gfx/text.h"
 #include "main.h"

eeshow/gfx/misc.c

@@ -16,7 +16,7 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "diag.h"
+#include "misc/diag.h"
 #include "gfx/misc.h"
 
 

eeshow/gfx/record.c

@@ -15,7 +15,7 @@
 #include <limits.h>
 #include <math.h>
 
-#include "util.h"
+#include "misc/util.h"
 #include "gfx/style.h"
 #include "gfx/gfx.h"
 #include "gfx/text.h"

eeshow/gfx/style.c

@@ -12,7 +12,7 @@
 
 #include <stdint.h>
 
-#include "util.h"
+#include "misc/util.h"
 #include "gfx/style.h"
 
 

eeshow/gfx/text.c

@@ -16,7 +16,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "util.h"
+#include "misc/util.h"
 #include "gfx/misc.h"
 #include "gfx/style.h"
 #include "gfx/gfx.h"

eeshow/gui/aoi.c

@@ -21,7 +21,7 @@
 #include <math.h>
 #include <assert.h>
 
-#include "util.h"
+#include "misc/util.h"
 #include "gui/aoi.h"
 
 

eeshow/gui/fmt-pango.c

@@ -18,8 +18,8 @@
 #include <ctype.h>
 #include <alloca.h>
 
-#include "util.h"
+#include "misc/util.h"
-#include "diag.h"
+#include "misc/diag.h"
 #include "gui/fmt-pango.h"
 
 

eeshow/gui/gui.c

@@ -28,8 +28,8 @@
 #include <cairo/cairo.h>
 #include <gtk/gtk.h>
 
-#include "util.h"
+#include "misc/util.h"
-#include "diag.h"
+#include "misc/diag.h"
 #include "gfx/style.h"
 #include "gfx/cro.h"
 #include "gfx/gfx.h"

eeshow/gui/over.c

@@ -30,7 +30,7 @@
 #include <cairo/cairo.h>
 #include <pango/pangocairo.h>
 
-#include "util.h"
+#include "misc/util.h"
 #include "gui/fmt-pango.h"
 #include "gui/aoi.h"
 #include "gui/style.h"

eeshow/kicad/delta.c

@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "util.h"
+#include "misc/util.h"
 #include "gfx/text.h"
 #include "kicad/lib.h"
 #include "kicad/sch.h"

eeshow/kicad/dwg.c

@@ -17,7 +17,7 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "util.h"
+#include "misc/util.h"
 #include "gfx/misc.h"
 #include "gfx/style.h"
 #include "gfx/text.h"

eeshow/kicad/lib-parse.c

@@ -15,8 +15,8 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "util.h"
+#include "misc/util.h"
-#include "diag.h"
+#include "misc/diag.h"
 #include "gfx/text.h"
 #include "file/file.h"
 #include "kicad/lib.h"

eeshow/kicad/lib-render.c

@@ -15,8 +15,8 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "util.h"
+#include "misc/util.h"
-#include "diag.h"
+#include "misc/diag.h"
 #include "gfx/misc.h"
 #include "gfx/style.h"
 #include "gfx/gfx.h"

eeshow/kicad/sch-parse.c

@@ -19,8 +19,8 @@
 #include <string.h>
 #include <assert.h>
 
-#include "util.h"
+#include "misc/util.h"
-#include "diag.h"
+#include "misc/diag.h"
 #include "kicad/dwg.h"
 #include "file/file.h"
 #include "kicad/lib.h"

eeshow/main.c

@@ -19,8 +19,8 @@
 
 #include <gtk/gtk.h>
 
-#include "util.h"
+#include "misc/util.h"
-#include "diag.h"
+#include "misc/diag.h"
 #include "gfx/fig.h"
 #include "gfx/cro.h"
 #include "gfx/diff.h"

eeshow/misc/diag.c

@@ -1,5 +1,5 @@
 /*
- * diag.h - Diagnostics
+ * misc/diag.h - Diagnostics
  *
  * Written 2016 by Werner Almesberger
  * Copyright 2016 by Werner Almesberger
@@ -18,7 +18,7 @@
 #include <errno.h>
 
 
-#include "diag.h"
+#include "misc/diag.h"
 
 
 unsigned verbose = 0;

eeshow/misc/diag.h

@@ -1,5 +1,5 @@
 /*
- * diag.h - Diagnostics
+ * misc/diag.h - Diagnostics
  *
  * Written 2016 by Werner Almesberger
  * Copyright 2016 by Werner Almesberger
@@ -10,8 +10,8 @@
  * (at your option) any later version.
  */
 
-#ifndef DIAG_H
+#ifndef MISC_DIAG_H
-#define	DIAG_H
+#define	MISC_DIAG_H
 
 /*
  * 0: no progress indications
@@ -68,4 +68,4 @@ void warning(const char *fmt, ...)
 void progress(unsigned level, const char *fmt, ...)
     __attribute__((format(printf, 2, 3)));
 
-#endif /* !DIAG_H */
+#endif /* !MISC_DIAG_H */

eeshow/misc/util.h

@@ -1,5 +1,5 @@
 /*
- * util.h - Common utility functions
+ * misc/util.h - Common utility functions
  *
  * Written 2016 by Werner Almesberger
  * Copyright 2016 Werner Almesberger
@@ -11,8 +11,8 @@
  */
 
 
-#ifndef UTIL_H
+#ifndef MISC_UTIL_H
-#define UTIL_H
+#define MISC_UTIL_H
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -50,4 +50,4 @@
 #define	unsupported(s) \
 	fprintf(stderr, __FILE__ ":%d: unsupported: " s "\n", __LINE__)
 
-#endif /* !UTIL_H */
+#endif /* !MISC_UTIL_H */