projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a few stylistic warnings from Apple's C compilers.
[u/mdw/putty]
/
misc.h
diff --git
a/misc.h
b/misc.h
index
12d0003
..
21540a3
100644
(file)
--- a/
misc.h
+++ b/
misc.h
@@
-3,6
+3,8
@@
#include "puttymem.h"
#include "puttymem.h"
+#include <stdarg.h> /* for va_list */
+
#ifndef FALSE
#define FALSE 0
#endif
#ifndef FALSE
#define FALSE 0
#endif
@@
-10,8
+12,12
@@
#define TRUE 1
#endif
#define TRUE 1
#endif
-char *dupstr(char *s);
-char *dupcat(char *s1, ...);
+char *dupstr(const char *s);
+char *dupcat(const char *s1, ...);
+char *dupprintf(const char *fmt, ...);
+char *dupvprintf(const char *fmt, va_list ap);
+
+void base64_encode_atom(unsigned char *data, int n, char *out);
struct bufchain_granule;
typedef struct bufchain_tag {
struct bufchain_granule;
typedef struct bufchain_tag {
@@
-25,6
+31,7
@@
int bufchain_size(bufchain *ch);
void bufchain_add(bufchain *ch, void *data, int len);
void bufchain_prefix(bufchain *ch, void **data, int *len);
void bufchain_consume(bufchain *ch, int len);
void bufchain_add(bufchain *ch, 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);
/*
* Debugging functions.
/*
* Debugging functions.
@@
-51,10
+58,15
@@
void debug_memdump(void *buf, int len, int L);
#define dmemdumpl(buf,len)
#endif
#define dmemdumpl(buf,len)
#endif
-
#ifndef lenof
#define lenof(x) ( (sizeof((x))) / (sizeof(*(x))))
#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
#endif