blind

commit 930a61412bc584ff6784e573042009d4e3f45fb6
parent 1d54e89222ae3fd67c9dfcb6b979fd6842909d2e
Author: Mattias Andrée <maandree@kth.se>
Date:   Mon,  9 Jan 2017 18:00:15 +0100

Fix warnings and add config.mk

Signed-off-by: Mattias Andrée <maandree@kth.se>

Diffstat:
M
.gitignore
 | 
16
++++++++++++++++
M
Makefile
 | 
4
+---
A
config.mk
 | 
3
+++
M
src/vu-dissolve.c
 | 
2
+-
M
src/vu-image-to-frame.c
 | 
1
+
M
src/vu-invert-luma.c
 | 
2
+-
M
src/vu-read-head.c
 | 
4
++--
M
src/vu-repeat.c
 | 
6
+++---
M
src/vu-set-alpha.c
 | 
2
+-
M
src/vu-stack.c
 | 
2
+-

10 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,19 @@
 *.swp
 *.o
 *.out
+vu-colour-srgb
+vu-concat
+vu-dissolve
+vu-flip
+vu-flop
+vu-frame-to-image
+vu-image-to-frame
+vu-invert-luma
+vu-next-frame
+vu-read-head
+vu-repeat
+vu-set-alpha
+vu-set-luma
+vu-single-colour
+vu-stack
+vu-write-head
diff --git a/Makefile b/Makefile
@@ -1,6 +1,4 @@
-CFLAGS   = -std=c99 -Wall -pedantic -O2
-CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_FILE_OFFSET_BITS=64
-LDFLAGS  = -lm -s
+include config.mk
 
 BIN =\
 	vu-colour-srgb\
diff --git a/config.mk b/config.mk
@@ -0,0 +1,3 @@
+CFLAGS   = -std=c99 -Wall -pedantic -O2
+CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_FILE_OFFSET_BITS=64
+LDFLAGS  = -lm -s
diff --git a/src/vu-dissolve.c b/src/vu-dissolve.c
@@ -44,7 +44,7 @@ main(int argc, char *argv[])
 	size_t f, h, w;
 	size_t n, i, fm;
 	ssize_t r;
-	void (*process)(struct stream *stream, size_t n, size_t f, size_t fm);
+	void (*process)(struct stream *stream, size_t n, size_t f, size_t fm) = NULL;
 
 	ARGBEGIN {
 	case 'r':
diff --git a/src/vu-image-to-frame.c b/src/vu-image-to-frame.c
@@ -115,6 +115,7 @@ main(int argc, char *argv[])
 		}
 	}
 header_done:
+	n = ptr;
 
 	if (!*width || !*height)
 		eprintf("convertion failed\n");
diff --git a/src/vu-invert-luma.c b/src/vu-invert-luma.c
@@ -50,7 +50,7 @@ main(int argc, char *argv[])
 	struct stream mask;
 	ssize_t r;
 	size_t i, n;
-	void (*process)(struct stream *colour, struct stream *mask, size_t n);
+	void (*process)(struct stream *colour, struct stream *mask, size_t n) = NULL;
 
 	ARGBEGIN {
 	case 'i':
diff --git a/src/vu-read-head.c b/src/vu-read-head.c
@@ -18,7 +18,7 @@ main(int argc, char *argv[])
 	char buf[2 + 3 * sizeof(size_t) + sizeof(((struct stream *)0)->pixfmt)];
 	char magic[] = {'\0', 'u', 'i', 'v', 'f'};
 	char b;
-	char *p, *end;
+	char *p;
 	size_t i, ptr;
 	ssize_t r;
 
@@ -42,6 +42,7 @@ main(int argc, char *argv[])
 	if (ptr == sizeof(buf))
 		goto bad_format;
 
+	p = buf;
 	for (i = 0; i < 5; i++) {
 		r = read(STDIN_FILENO, &b, 1);
 		if (r < 0)
@@ -50,7 +51,6 @@ main(int argc, char *argv[])
 			goto bad_format;
 	}
 
-	end = (p = buf) + ptr;
 	for (i = 0; i < 2; i++) {
 		if (!isdigit(*p))
 			goto bad_format;
diff --git a/src/vu-repeat.c b/src/vu-repeat.c
@@ -17,7 +17,7 @@ int
 main(int argc, char *argv[])
 {
 	struct stream stream;
-	size_t count, ptr, n, ptw;
+	size_t count = 0, ptr, n, ptw;
 	ssize_t r;
 	char buf[BUFSIZ];
 
@@ -37,9 +37,9 @@ main(int argc, char *argv[])
 	if (stream.fd < 0)
 		eprintf("open %s:", stream.file);
 	einit_stream(&stream);
-	if (stream->frame > SIZE_MAX / count)
+	if (stream.frames > SIZE_MAX / count)
 		eprintf("%s: video too long\n", stream.file);
-	stream->frame *= count;
+	stream.frames *= count;
 	fprint_stream_head(stdout, &stream);
 	fflush(stdout);
 	if (ferror(stdout))
diff --git a/src/vu-set-alpha.c b/src/vu-set-alpha.c
@@ -46,7 +46,7 @@ main(int argc, char *argv[])
 	struct stream alpha;
 	ssize_t r;
 	size_t i, n;
-	void (*process)(struct stream *colour, struct stream *alpha, size_t n);
+	void (*process)(struct stream *colour, struct stream *alpha, size_t n) = NULL;
 
 	ARGBEGIN {
 	case 'i':
diff --git a/src/vu-stack.c b/src/vu-stack.c
@@ -80,7 +80,7 @@ main(int argc, char *argv[])
 	size_t i, j, n;
 	ssize_t r;
 	size_t closed;
-	void (*process)(struct stream *streams, size_t n_streams, size_t n);
+	void (*process)(struct stream *streams, size_t n_streams, size_t n) = NULL;
 
 	ARGBEGIN {
 	case 'b':