X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fconvert.h;h=cb2bf77e6d0a27a1306cb364bc7baee794a8ca96;hb=4d7eb93b7c82da31f928349ac7c6cd551d78ca57;hp=853fef50639427c291de89444795393855bf7a98;hpb=4903e3f2fbd534bde1bc3ebc4d84328297e0b388;p=ypp-sc-tools.web-live.git

diff --git a/pctb/convert.h b/pctb/convert.h
index 853fef5..cb2bf77 100644
--- a/pctb/convert.h
+++ b/pctb/convert.h
@@ -14,19 +14,27 @@
 /*----- from structure.c -----*/
 
 void find_structure(CanonImage *im);
-CanonImage *file_read_image_ppm(FILE *f);
 void read_screenshots(void);
+void read_one_screenshot(void);
 void analyse(void);
 
 /*----- from convert.c -----*/
 
 extern FILE *screenshots_file;
 
-void vprogress(const char *fmt, va_list);
-void progress(const char *fmt, ...);
+#define FMT(f,a) __attribute__((format(printf,f,a)))
 
-void vprogress_log(const char *fmt, va_list);
-void progress_log(const char *fmt, ...);
+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);
 
 /*----- from pages.c -----*/