GopherProxy

	Remove common - surf - surf browser, a WebKit based browser
	git clone git://git.suckless.org/surf
	Log
	Files
	Refs
	README
	LICENSE
	---
	commit 8d5e2b3a40a86d463d666cbf61906cf22febde34
	parent 21fcbc004e16a9de46424fb21ad9c32270779a0d
	Author: Quentin Rameau <[email protected]>
	Date: Tue, 19 Feb 2019 05:33:04 +0100

	Remove common

	Diffstat:
	M Makefile \| 14 +++++---------
	D common.c \| 15 ---------------
	M common.h \| 2 --
	M surf.c \| 12 ++++++++++++
	M webext-surf.c \| 6 ++++--

	5 files changed, 21 insertions(+), 28 deletions(-)
	---
	diff --git a/Makefile b/Makefile
	@@ -5,10 +5,8 @@
	include config.mk

	SRC = surf.c
	-CSRC = common.c
	WSRC = webext-surf.c
	OBJ = $(SRC:.c=.o)
	-COBJ = $(CSRC:.c=.o)
	WOBJ = $(WSRC:.c=.o)
	WLIB = $(WSRC:.c=.so)

	@@ -25,23 +23,21 @@ options:
	$(CC) $(SURFCFLAGS) $(CFLAGS) -c $<

	.o.so:
	- $(CC) -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ \
	- $< $(COBJ) $(WEBEXTLIBS)
	+ $(CC) -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $< $(WEBEXTLIBS)

	config.h:
	cp config.def.h $@

	-$(OBJ) $(COBJ) $(WOBJ): config.h common.h config.mk
	-$(WLIB): $(COBJ)
	+$(OBJ) $(WOBJ): config.h common.h config.mk

	-surf: $(OBJ) $(COBJ)
	- $(CC) $(SURFLDFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(COBJ) $(LIBS)
	+surf: $(OBJ)
	+ $(CC) $(SURFLDFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)

	$(WOBJ):
	$(CC) $(WEBEXTCFLAGS) $(CFLAGS) -c $(@:.o=.c)

	clean:
	- rm -f surf $(OBJ) $(COBJ)
	+ rm -f surf $(OBJ)
	rm -f $(WLIB) $(WOBJ)

	distclean: clean
	diff --git a/common.c b/common.c
	@@ -1,15 +0,0 @@
	-#include <stdarg.h>
	-#include <stdio.h>
	-#include <stdlib.h>
	-
	-void
	-die(const char *errstr, ...)
	-{
	- va_list ap;
	-
	- va_start(ap, errstr);
	- vfprintf(stderr, errstr, ap);
	- va_end(ap);
	- exit(1);
	-}
	-
	diff --git a/common.h b/common.h
	@@ -1,3 +1 @@
	#define MSGBUFSZ 8
	-
	-void die(char *, ...);
	diff --git a/surf.c b/surf.c
	@@ -141,6 +141,7 @@ typedef struct {
	} SiteSpecific;

	/* Surf */
	+static void die(const char *errstr, ...);
	static void usage(void);
	static void setup(void);
	static void sigchld(int unused);
	@@ -302,6 +303,17 @@ static ParamName loadfinished[] = {
	#include "config.h"

	void
	+die(const char *errstr, ...)
	+{
	+ va_list ap;
	+
	+ va_start(ap, errstr);
	+ vfprintf(stderr, errstr, ap);
	+ va_end(ap);
	+ exit(1);
	+}
	+
	+void
	usage(void)
	{
	die("usage: surf [-bBdDfFgGiIkKmMnNpPsStTvwxX]\n"
	diff --git a/webext-surf.c b/webext-surf.c
	@@ -26,8 +26,10 @@ newpage(WebKitWebPage *page)
	{
	Page *p;

	- if (!(p = calloc(1, sizeof(Page))))
	- die("Cannot malloc!\n");
	+ if (!(p = calloc(1, sizeof(Page)))) {
	+ fputs("Cannot malloc!\n", stderr);
	+ exit(1);
	+ }

	p->next = pages;
	pages = p;