X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/7983f47ed4d055fd67c42ea5d9a1ddb8801d3ad9..2ac3322ef9bc032ad942753a56696764aa0b0f74:/misc.h

diff --git a/misc.h b/misc.h
index a59317e0..ae883e16 100644
--- a/misc.h
+++ b/misc.h
@@ -3,6 +3,10 @@
 
 #include "puttymem.h"
 
+#include <stdio.h>		       /* for FILE * */
+#include <stdarg.h>		       /* for va_list */
+#include <time.h>                      /* for struct tm */
+
 #ifndef FALSE
 #define FALSE 0
 #endif
@@ -10,8 +14,17 @@
 #define TRUE 1
 #endif
 
-char *dupstr(char *s);
-char *dupcat(char *s1, ...);
+typedef struct Filename Filename;
+typedef struct FontSpec FontSpec;
+
+unsigned long parse_blocksize(const char *bs);
+
+char *dupstr(const char *s);
+char *dupcat(const char *s1, ...);
+char *dupprintf(const char *fmt, ...);
+char *dupvprintf(const char *fmt, va_list ap);
+
+char *fgetline(FILE *fp);
 
 void base64_encode_atom(unsigned char *data, int n, char *out);
 
@@ -24,11 +37,13 @@ typedef struct bufchain_tag {
 void bufchain_init(bufchain *ch);
 void bufchain_clear(bufchain *ch);
 int bufchain_size(bufchain *ch);
-void bufchain_add(bufchain *ch, void *data, int len);
+void bufchain_add(bufchain *ch, const void *data, int len);
 void bufchain_prefix(bufchain *ch, void **data, int *len);
 void bufchain_consume(bufchain *ch, int len);
 void bufchain_fetch(bufchain *ch, void *data, int len);
 
+struct tm ltime(void);
+
 /*
  * Debugging functions.
  *
@@ -37,15 +52,15 @@ void bufchain_fetch(bufchain *ch, void *data, int len);
  * debug(()) (note the double brackets) is like printf().
  *
  * dmemdump() and dmemdumpl() both do memory dumps.  The difference
- * is that dmemdumpl() is more suited for when where the memory is is
+ * is that dmemdumpl() is more suited for when the memory address is
  * important (say because you'll be recording pointer values later
  * on).  dmemdump() is more concise.
  */
 
 #ifdef DEBUG
-void dprintf(char *fmt, ...);
+void debug_printf(char *fmt, ...);
 void debug_memdump(void *buf, int len, int L);
-#define debug(x) (dprintf x)
+#define debug(x) (debug_printf x)
 #define dmemdump(buf,len) debug_memdump (buf, len, 0);
 #define dmemdumpl(buf,len) debug_memdump (buf, len, 1);
 #else
@@ -54,10 +69,15 @@ void debug_memdump(void *buf, int len, int L);
 #define dmemdumpl(buf,len)
 #endif
 
-
 #ifndef lenof
 #define lenof(x) ( (sizeof((x))) / (sizeof(*(x))))
 #endif
 
+#ifndef min
+#define min(x,y) ( (x) < (y) ? (x) : (y) )
+#endif
+#ifndef max
+#define max(x,y) ( (x) > (y) ? (x) : (y) )
+#endif
 
 #endif