nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-22 14:39:24 -05:00
Code Issues Projects Releases Wiki Activity

misc.h: make some #defines into inline functions.

Browse Source 
Mainly this change affects the whole {GET,PUT}_??BIT_?SB_FIRST family,
which has always been a horrible set of macros for massive multiple-
expansion of its arguments. Now we're allowed to use C99 in this code
base, I can finally turn them into nice clean inline functions. As
bonus they now take their pointer argument as a void * (const-
qualified as appropriate) which means the call site doesn't have to
worry about exactly which flavour of pointer it's passing.

(That change also affects the GET_*_X11 macros in x11fwd.c, since I
was just reminded of their existence too!)

I've also converted NULLTOEMPTY, which was sitting right next to the
GET/PUT macros in misc.h and it seemed a shame to leave it out.
This commit is contained in:
Simon Tatham 2019-02-04 07:45:09 +00:00
parent acc21c4c0f
commit 961c39ccd0
2 changed files with 105 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
misc.h
View File

@ -239,89 +239,114 @@ void debug_memdump(const void *buf, int len, bool L);
#define max(x,y) ( (x) > (y) ? (x) : (y) ) #define max(x,y) ( (x) > (y) ? (x) : (y) )
#endif #endif
#define GET_64BIT_LSB_FIRST(cp) \ static inline uint64_t GET_64BIT_LSB_FIRST(const void *vp)
(((uint64_t)(unsigned char)(cp)[0]) | \ {
((uint64_t)(unsigned char)(cp)[1] << 8) | \ const uint8_t *p = (const uint8_t *)vp;
((uint64_t)(unsigned char)(cp)[2] << 16) | \ return (((uint64_t)p[0] ) | ((uint64_t)p[1] << 8) |
((uint64_t)(unsigned char)(cp)[3] << 24) | \ ((uint64_t)p[2] << 16) | ((uint64_t)p[3] << 24) |
((uint64_t)(unsigned char)(cp)[4] << 32) | \ ((uint64_t)p[4] << 32) | ((uint64_t)p[5] << 40) |
((uint64_t)(unsigned char)(cp)[5] << 40) | \ ((uint64_t)p[6] << 48) | ((uint64_t)p[7] << 56));
((uint64_t)(unsigned char)(cp)[6] << 48) | \ }
((uint64_t)(unsigned char)(cp)[7] << 56))
#define PUT_64BIT_LSB_FIRST(cp, value) ( \ static inline void PUT_64BIT_LSB_FIRST(void *vp, uint64_t value)
(cp)[0] = (unsigned char)(value), \ {
(cp)[1] = (unsigned char)((value) >> 8), \ uint8_t *p = (uint8_t *)vp;
(cp)[2] = (unsigned char)((value) >> 16), \ p[0] = value;
(cp)[3] = (unsigned char)((value) >> 24), \ p[1] = (value) >> 8;
(cp)[4] = (unsigned char)((value) >> 32), \ p[2] = (value) >> 16;
(cp)[5] = (unsigned char)((value) >> 40), \ p[3] = (value) >> 24;
(cp)[6] = (unsigned char)((value) >> 48), \ p[4] = (value) >> 32;
(cp)[7] = (unsigned char)((value) >> 56) ) p[5] = (value) >> 40;
p[6] = (value) >> 48;
p[7] = (value) >> 56;
}
#define GET_32BIT_LSB_FIRST(cp) \ static inline uint32_t GET_32BIT_LSB_FIRST(const void *vp)
(((uint32_t)(unsigned char)(cp)[0]) | \ {
((uint32_t)(unsigned char)(cp)[1] << 8) | \ const uint8_t *p = (const uint8_t *)vp;
((uint32_t)(unsigned char)(cp)[2] << 16) | \ return (((uint32_t)p[0] ) | ((uint32_t)p[1] << 8) |
((uint32_t)(unsigned char)(cp)[3] << 24)) ((uint32_t)p[2] << 16) | ((uint32_t)p[3] << 24));
}
#define PUT_32BIT_LSB_FIRST(cp, value) ( \ static inline void PUT_32BIT_LSB_FIRST(void *vp, uint32_t value)
(cp)[0] = (unsigned char)(value), \ {
(cp)[1] = (unsigned char)((value) >> 8), \ uint8_t *p = (uint8_t *)vp;
(cp)[2] = (unsigned char)((value) >> 16), \ p[0] = value;
(cp)[3] = (unsigned char)((value) >> 24) ) p[1] = (value) >> 8;
p[2] = (value) >> 16;
p[3] = (value) >> 24;
}
#define GET_16BIT_LSB_FIRST(cp) \ static inline uint16_t GET_16BIT_LSB_FIRST(const void *vp)
(((unsigned long)(unsigned char)(cp)[0]) | \ {
((unsigned long)(unsigned char)(cp)[1] << 8)) const uint8_t *p = (const uint8_t *)vp;
return (((uint16_t)p[0] ) | ((uint16_t)p[1] << 8));
}
#define PUT_16BIT_LSB_FIRST(cp, value) ( \ static inline void PUT_16BIT_LSB_FIRST(void *vp, uint16_t value)
(cp)[0] = (unsigned char)(value), \ {
(cp)[1] = (unsigned char)((value) >> 8) ) uint8_t *p = (uint8_t *)vp;
p[0] = value;
p[1] = (value) >> 8;
}
#define GET_32BIT_MSB_FIRST(cp) \ static inline uint64_t GET_64BIT_MSB_FIRST(const void *vp)
(((uint32_t)(unsigned char)(cp)[0] << 24) | \ {
((uint32_t)(unsigned char)(cp)[1] << 16) | \ const uint8_t *p = (const uint8_t *)vp;
((uint32_t)(unsigned char)(cp)[2] << 8) | \ return (((uint64_t)p[7] ) | ((uint64_t)p[6] << 8) |
((uint32_t)(unsigned char)(cp)[3])) ((uint64_t)p[5] << 16) | ((uint64_t)p[4] << 24) |
((uint64_t)p[3] << 32) | ((uint64_t)p[2] << 40) |
((uint64_t)p[1] << 48) | ((uint64_t)p[0] << 56));
}
#define PUT_32BIT_MSB_FIRST(cp, value) ( \ static inline void PUT_64BIT_MSB_FIRST(void *vp, uint64_t value)
(cp)[0] = (unsigned char)((value) >> 24), \ {
(cp)[1] = (unsigned char)((value) >> 16), \ uint8_t *p = (uint8_t *)vp;
(cp)[2] = (unsigned char)((value) >> 8), \ p[7] = value;
(cp)[3] = (unsigned char)(value) ) p[6] = (value) >> 8;
p[5] = (value) >> 16;
p[4] = (value) >> 24;
p[3] = (value) >> 32;
p[2] = (value) >> 40;
p[1] = (value) >> 48;
p[0] = (value) >> 56;
}
#define GET_64BIT_MSB_FIRST(cp) \ static inline uint32_t GET_32BIT_MSB_FIRST(const void *vp)
(((uint64_t)(unsigned char)(cp)[0] << 56) | \ {
((uint64_t)(unsigned char)(cp)[1] << 48) | \ const uint8_t *p = (const uint8_t *)vp;
((uint64_t)(unsigned char)(cp)[2] << 40) | \ return (((uint32_t)p[3] ) | ((uint32_t)p[2] << 8) |
((uint64_t)(unsigned char)(cp)[3] << 32) | \ ((uint32_t)p[1] << 16) | ((uint32_t)p[0] << 24));
((uint64_t)(unsigned char)(cp)[4] << 24) | \ }
((uint64_t)(unsigned char)(cp)[5] << 16) | \
((uint64_t)(unsigned char)(cp)[6] << 8) | \
((uint64_t)(unsigned char)(cp)[7]))
#define PUT_64BIT_MSB_FIRST(cp, value) ( \ static inline void PUT_32BIT_MSB_FIRST(void *vp, uint32_t value)
(cp)[0] = (unsigned char)((value) >> 56), \ {
(cp)[1] = (unsigned char)((value) >> 48), \ uint8_t *p = (uint8_t *)vp;
(cp)[2] = (unsigned char)((value) >> 40), \ p[3] = value;
(cp)[3] = (unsigned char)((value) >> 32), \ p[2] = (value) >> 8;
(cp)[4] = (unsigned char)((value) >> 24), \ p[1] = (value) >> 16;
(cp)[5] = (unsigned char)((value) >> 16), \ p[0] = (value) >> 24;
(cp)[6] = (unsigned char)((value) >> 8), \ }
(cp)[7] = (unsigned char)(value) )
#define GET_16BIT_MSB_FIRST(cp) \ static inline uint16_t GET_16BIT_MSB_FIRST(const void *vp)
(((unsigned long)(unsigned char)(cp)[0] << 8) | \ {
((unsigned long)(unsigned char)(cp)[1])) const uint8_t *p = (const uint8_t *)vp;
return (((uint16_t)p[1] ) | ((uint16_t)p[0] << 8));
}
#define PUT_16BIT_MSB_FIRST(cp, value) ( \ static inline void PUT_16BIT_MSB_FIRST(void *vp, uint16_t value)
(cp)[0] = (unsigned char)((value) >> 8), \ {
(cp)[1] = (unsigned char)(value) ) uint8_t *p = (uint8_t *)vp;
p[1] = value;
p[0] = (value) >> 8;
}
/* Replace NULL with the empty string, permitting an idiom in which we /* Replace NULL with the empty string, permitting an idiom in which we
* get a string (pointer,length) pair that might be NULL,0 and can * get a string (pointer,length) pair that might be NULL,0 and can
* then safely say things like printf("%.*s", length, NULLTOEMPTY(ptr)) */ * then safely say things like printf("%.*s", length, NULLTOEMPTY(ptr)) */
#define NULLTOEMPTY(s) ((s)?(s):"") static inline const char *NULLTOEMPTY(const char *s)
{
return s ? s : "";
}
#endif #endif

15
x11fwd.c
View File

@ -12,11 +12,18 @@
#include "sshchan.h" #include "sshchan.h"
#include "tree234.h" #include "tree234.h"
#define GET_16BIT_X11(endian, cp) \ static inline uint16_t GET_16BIT_X11(char endian, const void *p)
(endian=='B' ? GET_16BIT_MSB_FIRST(cp) : GET_16BIT_LSB_FIRST(cp)) {
return endian == 'B' ? GET_16BIT_MSB_FIRST(p) : GET_16BIT_LSB_FIRST(p);
}
#define PUT_16BIT_X11(endian, cp, val) \ static inline void PUT_16BIT_X11(char endian, void *p, uint16_t value)
(endian=='B' ? PUT_16BIT_MSB_FIRST(cp, val) : PUT_16BIT_LSB_FIRST(cp, val)) {
if (endian == 'B')
PUT_16BIT_MSB_FIRST(p, value);
else
PUT_16BIT_LSB_FIRST(p, value);
}
const char *const x11_authnames[] = { const char *const x11_authnames[] = {
"", "MIT-MAGIC-COOKIE-1", "XDM-AUTHORIZATION-1" "", "MIT-MAGIC-COOKIE-1", "XDM-AUTHORIZATION-1"