X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fcommon.h;h=47f898f06fecd31519d3bc0f717e0e024c1e41cf;hb=554e97659330463f4dc7e26c8a63537fc53fed1e;hp=73e55aea43378e68ea143a08d7d4d0decc1b5029;hpb=f2c5d45ada202f2ad2640b260cac2fd7bb83eb3e;p=ypp-sc-tools.db-test.git

diff --git a/pctb/common.h b/pctb/common.h
index 73e55ae..47f898f 100644
--- a/pctb/common.h
+++ b/pctb/common.h
@@ -31,7 +31,16 @@
 #define _GNU_SOURCE
 
 #include <stdarg.h>
-
+#include <stdio.h>
+#include <errno.h>
+#include <assert.h>
+#include <string.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <inttypes.h>
+
+#include <sys/wait.h>
 #include <sys/types.h>
 
 typedef struct {
@@ -51,12 +60,17 @@ typedef struct { /* both inclusive */
   Point br;
 } Rect;
 
+#define RECT_W(r) ((r).br.x - (r).tl.x + 1)
+#define RECT_H(r) ((r).br.y - (r).tl.y + 1)
+
 
 
 #define DEBUG_FLAG_LIST				\
    DF(findypp)					\
    DF(pages)					\
    DF(rect)					\
+   DF(pixmap)					\
+   DF(struct)					\
    DF(ocr)					\
    DF(callout)
 
@@ -81,6 +95,7 @@ void debug_flush(void);
 const char *get_vardir(void);
 
 #define FMT(f,a) __attribute__((format(printf,f,a)))
+#define SCANFMT(f,a) __attribute__((format(scanf,f,a)))
 #define NORET __attribute__((noreturn))
 
 #define DEFINE_VWRAPPERF(decls, funcf, otherattribs)			\
@@ -110,9 +125,23 @@ void fatal(const char *fmt, ...)       FMT(1,2) NORET;
 void sysassert_fail(const char *file, int line, const char *what)
    __attribute__((noreturn));
 
+void waitpid_check_exitstatus(pid_t pid, const char *what);
+
 
 void *mmalloc(size_t sz);
 void *mrealloc(void *p, size_t sz);
 
 
+#define dbassert(x) ((x) ? (void)0 : dbfile_assertfail(__FILE__,__LINE__,#x))
+void dbfile_assertfail(const char *file, int line, const char *m) NORET;
+
+FILE *dbfile;
+void dbfile_getsline(char *lbuf, size_t lbufsz, const char *file, int line);
+int dbfile_open(const char *tpath); /* 0: ENOENT; 1: worked */
+void dbfile_close(void); /* idempotent */
+
+int dbfile_scanf(const char *fmt, ...) SCANFMT(1,2);
+int dbfile_vscanf(const char *fmt, va_list al) SCANFMT(1,0);
+
+
 #endif /*COMMON_H*/