tAdd a file for shared functions - surf - customized build of surf, the suckless webkit browser
 (HTM) git clone git://src.adamsgaard.dk/surf
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) README
 (DIR) LICENSE
       ---
 (DIR) commit 1901359efa10fe2e18794df34fc33b81da03a6f5
 (DIR) parent 7ea0c2f7f8c5cc4616d8dc0676f7b4b59351667b
 (HTM) Author: Quentin Rameau <quinq@fifth.space>
       Date:   Mon,  4 Jan 2016 16:09:12 +0100
       
       Add a file for shared functions
       
       New common.[hc] files where shared functions between surf and
       webkitextension will be put. First addition is die().
       
       Diffstat:
         M Makefile                            |       6 +++---
         A common.c                            |      15 +++++++++++++++
         A common.h                            |       3 +++
         M libsurf-webext.c                    |       4 ++--
         M surf.c                              |      14 +-------------
       
       5 files changed, 24 insertions(+), 18 deletions(-)
       ---
 (DIR) diff --git a/Makefile b/Makefile
       t@@ -4,9 +4,9 @@
        
        include config.mk
        
       -SRC = surf.c
       +SRC = surf.c common.c
        OBJ = $(SRC:.c=.o)
       -LIBSRC = libsurf-webext.c
       +LIBSRC = libsurf-webext.c common.c
        LIBOBJ = $(LIBSRC:.c=.lo)
        
        all: options libsurf-webext.la surf
       t@@ -38,7 +38,7 @@ config.h:
        libsurf-webext.la: $(LIBOBJ)
                @echo libtool link $@
                @$(LIBTOOL) --mode link --tag CC $(CC) $(LIBLDFLAGS) -o $@ \
       -            $(LIBOBJ) -rpath $(DESTDIR)$(LIBPREFIX)
       +            $(LIBOBJ) $(LIB) -rpath $(DESTDIR)$(LIBPREFIX)
        
        surf: $(OBJ)
                @echo CC -o $@
 (DIR) diff --git a/common.c b/common.c
       t@@ -0,0 +1,15 @@
       +#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);
       +}
       +
 (DIR) diff --git a/common.h b/common.h
       t@@ -0,0 +1,3 @@
       +#define MSGBUFSZ 32
       +
       +void die(char *, ...);
 (DIR) diff --git a/libsurf-webext.c b/libsurf-webext.c
       t@@ -8,9 +8,9 @@
        #include <webkitdom/webkitdom.h>
        #include <webkitdom/WebKitDOMDOMWindowUnstable.h>
        
       -#define LENGTH(x)   (sizeof(x) / sizeof(x[0]))
       +#include "common.h"
        
       -#define MSGBUFSZ 32
       +#define LENGTH(x)   (sizeof(x) / sizeof(x[0]))
        
        typedef struct Page {
                guint64 id;
 (DIR) diff --git a/surf.c b/surf.c
       t@@ -30,10 +30,10 @@
        #include <glib.h>
        
        #include "arg.h"
       +#include "common.h"
        
        #define LENGTH(x)               (sizeof(x) / sizeof(x[0]))
        #define CLEANMASK(mask)         (mask & (MODKEY|GDK_SHIFT_MASK))
       -#define MSGBUFSZ 32
        
        enum { AtomFind, AtomGo, AtomUri, AtomLast };
        
       t@@ -142,7 +142,6 @@ typedef struct {
        
        /* Surf */
        static void usage(void);
       -static void die(const char *errstr, ...);
        static void setup(void);
        static void sigchld(int unused);
        static void sighup(int unused);
       t@@ -311,17 +310,6 @@ usage(void)
        }
        
        void
       -die(const char *errstr, ...)
       -{
       -        va_list ap;
       -
       -        va_start(ap, errstr);
       -        vfprintf(stderr, errstr, ap);
       -        va_end(ap);
       -        exit(1);
       -}
       -
       -void
        setup(void)
        {
                GIOChannel *gchanin;