diff options
Diffstat (limited to 'lib/isc/win32')
| -rw-r--r-- | lib/isc/win32/file.c | 8 | ||||
| -rw-r--r-- | lib/isc/win32/fsaccess.c | 2 | ||||
| -rw-r--r-- | lib/isc/win32/include/isc/net.h | 4 | ||||
| -rw-r--r-- | lib/isc/win32/include/isc/stat.h | 4 |
4 files changed, 11 insertions, 7 deletions
diff --git a/lib/isc/win32/file.c b/lib/isc/win32/file.c index 32f6a19..7da57fc 100644 --- a/lib/isc/win32/file.c +++ b/lib/isc/win32/file.c @@ -569,10 +569,14 @@ isc_file_isabsolute(const char *filename) { if ((filename[0] == '\\') && (filename[1] == '\\')) { return (true); } - if (isalpha(filename[0]) && filename[1] == ':' && filename[2] == '\\') { + if (isalpha((unsigned char)filename[0]) && filename[1] == ':' && + filename[2] == '\\') + { return (true); } - if (isalpha(filename[0]) && filename[1] == ':' && filename[2] == '/') { + if (isalpha((unsigned char)filename[0]) && filename[1] == ':' && + filename[2] == '/') + { return (true); } return (false); diff --git a/lib/isc/win32/fsaccess.c b/lib/isc/win32/fsaccess.c index 909f9e5..eb1ab54 100644 --- a/lib/isc/win32/fsaccess.c +++ b/lib/isc/win32/fsaccess.c @@ -70,7 +70,7 @@ is_ntfs(const char *file) { * Look for c:\path\... style, c:/path/... or \\computer\shar\path... * the UNC style file specs */ - if (isalpha(filename[0]) && filename[1] == ':' && + if (isalpha((unsigned char)filename[0]) && filename[1] == ':' && (filename[2] == '\\' || filename[2] == '/')) { /* Copy 'c:\' or 'c:/' and NUL terminate. */ diff --git a/lib/isc/win32/include/isc/net.h b/lib/isc/win32/include/isc/net.h index 391614e..3f17223 100644 --- a/lib/isc/win32/include/isc/net.h +++ b/lib/isc/win32/include/isc/net.h @@ -123,10 +123,10 @@ typedef uint16_t in_port_t; #define ISC__IPADDR(x) ((uint32_t)htonl((uint32_t)(x))) #define ISC_IPADDR_ISMULTICAST(i) \ - (((uint32_t)(i)&ISC__IPADDR(0xf0000000)) == ISC__IPADDR(0xe0000000)) + (((uint32_t)(i) & ISC__IPADDR(0xf0000000)) == ISC__IPADDR(0xe0000000)) #define ISC_IPADDR_ISEXPERIMENTAL(i) \ - (((uint32_t)(i)&ISC__IPADDR(0xf0000000)) == ISC__IPADDR(0xf0000000)) + (((uint32_t)(i) & ISC__IPADDR(0xf0000000)) == ISC__IPADDR(0xf0000000)) /* * Fix the FD_SET and FD_CLR Macros to properly cast diff --git a/lib/isc/win32/include/isc/stat.h b/lib/isc/win32/include/isc/stat.h index 63577f9..bc0ec04 100644 --- a/lib/isc/win32/include/isc/stat.h +++ b/lib/isc/win32/include/isc/stat.h @@ -49,10 +49,10 @@ typedef unsigned short mode_t; #endif /* ifndef S_IFREG */ #ifndef S_ISDIR -#define S_ISDIR(m) (((m)&S_IFMT) == S_IFDIR) +#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) #endif /* ifndef S_ISDIR */ #ifndef S_ISREG -#define S_ISREG(m) (((m)&S_IFMT) == S_IFREG) +#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) #endif /* ifndef S_ISREG */ #endif /* ISC_STAT_H */ |