X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2Fcommon.h;h=5decee20e1e2b12c657f63068f2b4de2def27ec9;hp=9d06fabf9a55c79b8a1878a649b8db03f6aaa083;hb=3ece24832da57c70c4ca1c745d6dd79227447322;hpb=c68fb80a6bbf7acbcac4b2cb2143f5fea745cd2b

diff --git a/yarrg/common.h b/yarrg/common.h
index 9d06fab..5decee2 100644
--- a/yarrg/common.h
+++ b/yarrg/common.h
@@ -39,12 +39,10 @@
 #include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <unistd.h>
 #include <dirent.h>
 #include <inttypes.h>
-#include <fnmatch.h>
-
-#include <pcre.h>
 
 #include <fcntl.h>
 #include <unistd.h>
@@ -71,19 +69,7 @@ typedef struct { /* both inclusive */
 #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(rsync)					\
-   DF(structcolon)				\
-   DF(callout)
-
+#ifdef DEBUG_FLAG_LIST
 enum {
 #define DF(f) dbg__shift_##f,
   DEBUG_FLAG_LIST
@@ -94,16 +80,18 @@ enum {
   DEBUG_FLAG_LIST
 #undef DF
 };
+#define DEBUGP(f) (!!(debug_flags & dbg_##f))
 
-unsigned debug_flags;
+#endif /*DEBUG_FLAG_LIST*/
 
-#define DEBUGP(f) (!!(debug_flags & dbg_##f))
+#ifndef debug_flags
+extern unsigned debug_flags;
+#endif
 
 void debug_flush(void);
-#define debug stderr
-
-const char *get_vardir(void);
-const char *get_libdir(void);
+#ifndef debug
+# define debug stderr
+#endif
 
 #define FMT(f,a) __attribute__((format(printf,f,a)))
 #define SCANFMT(f,a) __attribute__((format(scanf,f,a)))
@@ -127,6 +115,20 @@ const char *get_libdir(void);
 
 /*---------- error handling ----------*/
 
+extern int o_quiet;
+
+void vwarning(const char *fmt, va_list) FMT(1,0);
+void warning(const char *fmt, ...)      FMT(1,2);
+
+void vprogress(const char *fmt, va_list) FMT(1,0);
+void progress(const char *fmt, ...)      FMT(1,2);
+
+void vprogress_log(const char *fmt, va_list) FMT(1,0);
+void progress_log(const char *fmt, ...)      FMT(1,2);
+
+void vprogress_spinner(const char *fmt, va_list) FMT(1,0);
+void progress_spinner(const char *fmt, ...)      FMT(1,2);
+
 void vfatal(const char *fmt, va_list)  FMT(1,0) NORET;
 void fatal(const char *fmt, ...)       FMT(1,2) NORET;
 
@@ -140,37 +142,11 @@ void waitpid_check_exitstatus(pid_t pid, const char *what, int sigpipeok);
 
 
 void *mmalloc(size_t sz);
+void *mcalloc(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 */
-int dbfile_gzopen(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);
-
-int gzopen(const char *zpath, int oflags, FILE **f_r, pid_t *pid_r,
-	   const char *gziplevel /* 0 for read; may be 0, or "-1" etc. */);
-  /* returns errno value from open */
-void gzclose(FILE **f, pid_t *p, const char *what);
-  /* also OK with f==0, or p==-1 */
-
 char *masprintf(const char *fmt, ...) FMT(1,2);
 
-#define EXECLP_HELPER(helper, ...) do{				\
-    char *helper_path= masprintf("%s/%s",get_libdir(),helper);	\
-    execlp(helper_path,helper, __VA_ARGS__);			\
-    sysassert(errno==ENOENT);					\
-    fatal("Failed to find helper program %s.\n"			\
-	  "(Are you in the correct directory?)", helper);	\
-  }while(0)
-
 
 #define ARRAYSIZE(a) ((sizeof((a)) / sizeof((a)[0])))
 #define FILLZERO(obj) (memset(&(obj),0,sizeof((obj))))