summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Almesberger <werner@almesberger.net>2016-08-17 21:37:15 -0300
committerWerner Almesberger <werner@almesberger.net>2016-08-17 21:37:15 -0300
commit30d665115a8f7d72f659a1e77b6eb14e727fbe57 (patch)
treef0ff40e1a6b654571745dc5c289a8ed6cfd103ca
parentae27fe967c09bf0d685952dc7a943d1535eb6af4 (diff)
downloadeeshow-30d665115a8f7d72f659a1e77b6eb14e727fbe57.tar.gz
eeshow-30d665115a8f7d72f659a1e77b6eb14e727fbe57.tar.bz2
eeshow-30d665115a8f7d72f659a1e77b6eb14e727fbe57.zip
eeshow/: util.h and diag.c go to misc/
-rw-r--r--Makefile2
-rw-r--r--file/file.c4
-rw-r--r--file/git-file.c4
-rw-r--r--file/git-hist.c4
-rw-r--r--gfx/cro.c4
-rw-r--r--gfx/diff.c4
-rw-r--r--gfx/fig.c4
-rw-r--r--gfx/misc.c2
-rw-r--r--gfx/record.c2
-rw-r--r--gfx/style.c2
-rw-r--r--gfx/text.c2
-rw-r--r--gui/aoi.c2
-rw-r--r--gui/fmt-pango.c4
-rw-r--r--gui/gui.c4
-rw-r--r--gui/over.c2
-rw-r--r--kicad/delta.c2
-rw-r--r--kicad/dwg.c2
-rw-r--r--kicad/lib-parse.c4
-rw-r--r--kicad/lib-render.c4
-rw-r--r--kicad/sch-parse.c4
-rw-r--r--main.c4
-rw-r--r--misc/diag.c (renamed from diag.c)4
-rw-r--r--misc/diag.h (renamed from diag.h)8
-rw-r--r--misc/util.h (renamed from util.h)8
24 files changed, 43 insertions, 43 deletions
diff --git a/Makefile b/Makefile
index 8250c6c..ce7b7ed 100644
--- a/Makefile
+++ b/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 \
diff --git a/file/file.c b/file/file.c
index 8782e58..6d84ed8 100644
--- a/file/file.c
+++ b/file/file.c
@@ -16,8 +16,8 @@
#include <stdio.h>
#include <string.h>
-#include "util.h"
-#include "diag.h"
+#include "misc/util.h"
+#include "misc/diag.h"
#include "file/git-file.h"
#include "file/file.h"
diff --git a/file/git-file.c b/file/git-file.c
index 6a78c9c..cc90141 100644
--- a/file/git-file.c
+++ b/file/git-file.c
@@ -20,8 +20,8 @@
#include <git2.h>
-#include "util.h"
-#include "diag.h"
+#include "misc/util.h"
+#include "misc/diag.h"
#include "file/file.h"
#include "file/git-util.h"
#include "file/git-file.h"
diff --git a/file/git-hist.c b/file/git-hist.c
index 1826b9f..a06ac12 100644
--- a/file/git-hist.c
+++ b/file/git-hist.c
@@ -16,8 +16,8 @@
#include <time.h> /* for vcs_long_for_pango */
#include <alloca.h>
-#include "util.h"
-#include "diag.h"
+#include "misc/util.h"
+#include "misc/diag.h"
#include "file/git-util.h"
#include "file/git-file.h"
#include "file/git-hist.h"
diff --git a/gfx/cro.c b/gfx/cro.c
index e3e1658..e4ac88b 100644
--- a/gfx/cro.c
+++ b/gfx/cro.c
@@ -22,8 +22,8 @@
#include <cairo/cairo.h>
#include <cairo/cairo-pdf.h>
-#include "util.h"
-#include "diag.h"
+#include "misc/util.h"
+#include "misc/diag.h"
#include "gfx/style.h"
#include "gfx/text.h"
#include "gfx/gfx.h"
diff --git a/gfx/diff.c b/gfx/diff.c
index 9544693..dc3e1f1 100644
--- a/gfx/diff.c
+++ b/gfx/diff.c
@@ -19,8 +19,8 @@
#include <cairo/cairo.h>
-#include "util.h"
-#include "diag.h"
+#include "misc/util.h"
+#include "misc/diag.h"
#include "main.h"
#include "gfx/cro.h"
#include "file/file.h"
diff --git a/gfx/fig.c b/gfx/fig.c
index 0b1cbcc..fa1365c 100644
--- a/gfx/fig.c
+++ b/gfx/fig.c
@@ -19,8 +19,8 @@
#include <math.h>
#include <assert.h>
-#include "util.h"
-#include "diag.h"
+#include "misc/util.h"
+#include "misc/diag.h"
#include "gfx/style.h"
#include "gfx/text.h"
#include "main.h"
diff --git a/gfx/misc.c b/gfx/misc.c
index 06f87e6..dd3cef9 100644
--- a/gfx/misc.c
+++ b/gfx/misc.c
@@ -16,7 +16,7 @@
#include <stdio.h>
#include <assert.h>
-#include "diag.h"
+#include "misc/diag.h"
#include "gfx/misc.h"
diff --git a/gfx/record.c b/gfx/record.c
index 91a2652..f224a48 100644
--- a/gfx/record.c
+++ b/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"
diff --git a/gfx/style.c b/gfx/style.c
index 5628b41..a2c58ab 100644
--- a/gfx/style.c
+++ b/gfx/style.c
@@ -12,7 +12,7 @@
#include <stdint.h>
-#include "util.h"
+#include "misc/util.h"
#include "gfx/style.h"
diff --git a/gfx/text.c b/gfx/text.c
index 58c8c5a..46147c5 100644
--- a/gfx/text.c
+++ b/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"
diff --git a/gui/aoi.c b/gui/aoi.c
index 2e0e6ee..5349613 100644
--- a/gui/aoi.c
+++ b/gui/aoi.c
@@ -21,7 +21,7 @@
#include <math.h>
#include <assert.h>
-#include "util.h"
+#include "misc/util.h"
#include "gui/aoi.h"
diff --git a/gui/fmt-pango.c b/gui/fmt-pango.c
index 96deba4..8e975dc 100644
--- a/gui/fmt-pango.c
+++ b/gui/fmt-pango.c
@@ -18,8 +18,8 @@
#include <ctype.h>
#include <alloca.h>
-#include "util.h"
-#include "diag.h"
+#include "misc/util.h"
+#include "misc/diag.h"
#include "gui/fmt-pango.h"
diff --git a/gui/gui.c b/gui/gui.c
index fd39354..ccbd7ba 100644
--- a/gui/gui.c
+++ b/gui/gui.c
@@ -28,8 +28,8 @@
#include <cairo/cairo.h>
#include <gtk/gtk.h>
-#include "util.h"
-#include "diag.h"
+#include "misc/util.h"
+#include "misc/diag.h"
#include "gfx/style.h"
#include "gfx/cro.h"
#include "gfx/gfx.h"
diff --git a/gui/over.c b/gui/over.c
index aedfd92..43aa80a 100644
--- a/gui/over.c
+++ b/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"
diff --git a/kicad/delta.c b/kicad/delta.c
index 44e13a9..6a4a2cd 100644
--- a/kicad/delta.c
+++ b/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"
diff --git a/kicad/dwg.c b/kicad/dwg.c
index a2a2be5..282c1f6 100644
--- a/kicad/dwg.c
+++ b/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"
diff --git a/kicad/lib-parse.c b/kicad/lib-parse.c
index edd429f..2c1fe04 100644
--- a/kicad/lib-parse.c
+++ b/kicad/lib-parse.c
@@ -15,8 +15,8 @@
#include <stdio.h>
#include <assert.h>
-#include "util.h"
-#include "diag.h"
+#include "misc/util.h"
+#include "misc/diag.h"
#include "gfx/text.h"
#include "file/file.h"
#include "kicad/lib.h"
diff --git a/kicad/lib-render.c b/kicad/lib-render.c
index c4a8477..56773a2 100644
--- a/kicad/lib-render.c
+++ b/kicad/lib-render.c
@@ -15,8 +15,8 @@
#include <stdio.h>
#include <assert.h>
-#include "util.h"
-#include "diag.h"
+#include "misc/util.h"
+#include "misc/diag.h"
#include "gfx/misc.h"
#include "gfx/style.h"
#include "gfx/gfx.h"
diff --git a/kicad/sch-parse.c b/kicad/sch-parse.c
index c4b893f..3b7878f 100644
--- a/kicad/sch-parse.c
+++ b/kicad/sch-parse.c
@@ -19,8 +19,8 @@
#include <string.h>
#include <assert.h>
-#include "util.h"
-#include "diag.h"
+#include "misc/util.h"
+#include "misc/diag.h"
#include "kicad/dwg.h"
#include "file/file.h"
#include "kicad/lib.h"
diff --git a/main.c b/main.c
index 1e85b71..c654d08 100644
--- a/main.c
+++ b/main.c
@@ -19,8 +19,8 @@
#include <gtk/gtk.h>
-#include "util.h"
-#include "diag.h"
+#include "misc/util.h"
+#include "misc/diag.h"
#include "gfx/fig.h"
#include "gfx/cro.h"
#include "gfx/diff.h"
diff --git a/diag.c b/misc/diag.c
index 46cc49f..908deb8 100644
--- a/diag.c
+++ b/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;
diff --git a/diag.h b/misc/diag.h
index e97d599..025b791 100644
--- a/diag.h
+++ b/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
-#define DIAG_H
+#ifndef MISC_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 */
diff --git a/util.h b/misc/util.h
index 159e0df..d0c5610 100644
--- a/util.h
+++ b/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
-#define UTIL_H
+#ifndef MISC_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 */