Substitute 0x7fffffff and 0xffffffff by INT32_MAX and UINT32_MAX

throughout, except in assembler code.
This commit is contained in:
Corinna Vinschen 2003-12-03 16:35:52 +00:00
parent d2fa946e51
commit 145b4dc249
11 changed files with 21 additions and 16 deletions

View File

@ -1,3 +1,8 @@
2003-12-03 Corinna Vinschen <corinna@vinschen.de>
Substitute 0x7fffffff and 0xffffffff by INT32_MAX and UINT32_MAX
throughout, except in assembler code.
2003-12-03 Corinna Vinschen <corinna@vinschen.de> 2003-12-03 Corinna Vinschen <corinna@vinschen.de>
* fhandler_disk_file.cc (fhandler_disk_file::lock): Use UINT32_MAX * fhandler_disk_file.cc (fhandler_disk_file::lock): Use UINT32_MAX

View File

@ -131,7 +131,7 @@ struct device
const char *native; const char *native;
_mode_t mode; _mode_t mode;
bool dev_on_fs; bool dev_on_fs;
static const device *lookup (const char *, unsigned int = 0xffffffff); static const device *lookup (const char *, unsigned int = UINT32_MAX);
void parse (const char *); void parse (const char *);
void parse (_major_t major, _minor_t minor); void parse (_major_t major, _minor_t minor);
void parse (_dev_t dev); void parse (_dev_t dev);

View File

@ -856,7 +856,7 @@ fhandler_base::lseek (_off64_t offset, int whence)
DWORD win32_whence = whence == SEEK_SET ? FILE_BEGIN DWORD win32_whence = whence == SEEK_SET ? FILE_BEGIN
: (whence == SEEK_CUR ? FILE_CURRENT : FILE_END); : (whence == SEEK_CUR ? FILE_CURRENT : FILE_END);
LONG off_low = ((__uint64_t) offset) & 0xffffffffLL; LONG off_low = ((__uint64_t) offset) & UINT32_MAX;
LONG *poff_high, off_high; LONG *poff_high, off_high;
if (!wincap.has_64bit_file_access ()) if (!wincap.has_64bit_file_access ())
poff_high = NULL; poff_high = NULL;

View File

@ -232,7 +232,7 @@ class fhandler_base
void set_append_p () { FHSETF (APPEND); } void set_append_p () { FHSETF (APPEND); }
void set_fs_flags (DWORD flags) { fs_flags = flags; } void set_fs_flags (DWORD flags) { fs_flags = flags; }
bool get_fs_flags (DWORD flagval = 0xffffffffUL) bool get_fs_flags (DWORD flagval = UINT32_MAX)
{ return (fs_flags & (flagval)); } { return (fs_flags & (flagval)); }
bool get_query_open () { return FHISSETF (QUERYOPEN); } bool get_query_open () { return FHISSETF (QUERYOPEN); }

View File

@ -172,7 +172,7 @@ fhandler_dev_floppy::lseek (_off64_t offset, int whence)
return ret; return ret;
devbufstart = devbufend = 0; devbufstart = devbufend = 0;
low = sector_aligned_offset & 0xffffffff; low = sector_aligned_offset & UINT32_MAX;
high = sector_aligned_offset >> 32; high = sector_aligned_offset >> 32;
if (SetFilePointer (get_handle (), low, &high, FILE_BEGIN) if (SetFilePointer (get_handle (), low, &high, FILE_BEGIN)
== INVALID_SET_FILE_POINTER && GetLastError ()) == INVALID_SET_FILE_POINTER && GetLastError ())

View File

@ -920,7 +920,7 @@ fhandler_disk_file::mmap (caddr_t *addr, size_t len, DWORD access,
return INVALID_HANDLE_VALUE; return INVALID_HANDLE_VALUE;
} }
DWORD high = off >> 32, low = off & 0xffffffff; DWORD high = off >> 32, low = off & UINT32_MAX;
void *base = NULL; void *base = NULL;
/* If a non-zero address is given, try mapping using the given address first. /* If a non-zero address is given, try mapping using the given address first.
If it fails and flags is not MAP_FIXED, try again with NULL address. */ If it fails and flags is not MAP_FIXED, try again with NULL address. */

View File

@ -506,9 +506,9 @@ dup_ent (void *old, void *src0, struct_type type)
{ {
/* Windows 95 idiocy. Structure is misaligned on Windows 95. /* Windows 95 idiocy. Structure is misaligned on Windows 95.
Kludge around this by trying a different pointer alignment. */ Kludge around this by trying a different pointer alignment. */
if (!IsBadStringPtr (src->s_proto, 0x7fffffff)) if (!IsBadStringPtr (src->s_proto, INT32_MAX))
s_proto = src->s_proto; s_proto = src->s_proto;
else if (!IsBadStringPtr (((pservent *) src)->s_proto, 0x7fffffff)) else if (!IsBadStringPtr (((pservent *) src)->s_proto, INT32_MAX))
s_proto = ((pservent *) src)->s_proto; s_proto = ((pservent *) src)->s_proto;
sz += (protolen = strlen_round (s_proto)); sz += (protolen = strlen_round (s_proto));
} }

View File

@ -15,7 +15,7 @@ details. */
struct _reent; struct _reent;
extern struct _reent reent_data; extern struct _reent reent_data;
#define PER_THREAD_FORK_CLEAR ((void *)0xffffffff) #define PER_THREAD_FORK_CLEAR ((void *)UINT32_MAX)
class per_thread class per_thread
{ {
DWORD tls; DWORD tls;

View File

@ -317,7 +317,7 @@ _pinfo::commune_recv ()
const char *argv[__argc_safe + 1]; const char *argv[__argc_safe + 1];
for (int i = 0; i < __argc_safe; i++) for (int i = 0; i < __argc_safe; i++)
{ {
if (IsBadStringPtr (__argv[i], 0x7fffffff)) if (IsBadStringPtr (__argv[i], INT32_MAX))
argv[i] = ""; argv[i] = "";
else else
argv[i] = __argv[i]; argv[i] = __argv[i];

View File

@ -808,7 +808,7 @@ create_token (cygsid &usersid, user_groups &new_groups, struct passwd *pw)
BOOL special_pgrp = FALSE; BOOL special_pgrp = FALSE;
char sa_buf[1024]; char sa_buf[1024];
LUID auth_luid = SYSTEM_LUID; LUID auth_luid = SYSTEM_LUID;
LARGE_INTEGER exp = { QuadPart:0x7fffffffffffffffLL }; LARGE_INTEGER exp = { QuadPart:INT64_MAX };
TOKEN_USER user; TOKEN_USER user;
PTOKEN_GROUPS new_tok_gsids = NULL; PTOKEN_GROUPS new_tok_gsids = NULL;

View File

@ -270,7 +270,7 @@ static NO_COPY wincaps wincap_me = {
}; };
static NO_COPY wincaps wincap_nt3 = { static NO_COPY wincaps wincap_nt3 = {
lock_file_highword:0xffffffff, lock_file_highword:UINT32_MAX,
chunksize:0, chunksize:0,
shared:FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, shared:FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
is_winnt:true, is_winnt:true,
@ -313,7 +313,7 @@ static NO_COPY wincaps wincap_nt3 = {
}; };
static NO_COPY wincaps wincap_nt4 = { static NO_COPY wincaps wincap_nt4 = {
lock_file_highword:0xffffffff, lock_file_highword:UINT32_MAX,
chunksize:0, chunksize:0,
shared:FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, shared:FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
is_winnt:true, is_winnt:true,
@ -356,7 +356,7 @@ static NO_COPY wincaps wincap_nt4 = {
}; };
static NO_COPY wincaps wincap_nt4sp4 = { static NO_COPY wincaps wincap_nt4sp4 = {
lock_file_highword:0xffffffff, lock_file_highword:UINT32_MAX,
chunksize:0, chunksize:0,
shared:FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, shared:FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
is_winnt:true, is_winnt:true,
@ -399,7 +399,7 @@ static NO_COPY wincaps wincap_nt4sp4 = {
}; };
static NO_COPY wincaps wincap_2000 = { static NO_COPY wincaps wincap_2000 = {
lock_file_highword:0xffffffff, lock_file_highword:UINT32_MAX,
chunksize:0, chunksize:0,
shared:FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, shared:FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
is_winnt:true, is_winnt:true,
@ -442,7 +442,7 @@ static NO_COPY wincaps wincap_2000 = {
}; };
static NO_COPY wincaps wincap_xp = { static NO_COPY wincaps wincap_xp = {
lock_file_highword:0xffffffff, lock_file_highword:UINT32_MAX,
chunksize:0, chunksize:0,
shared:FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, shared:FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
is_winnt:true, is_winnt:true,
@ -485,7 +485,7 @@ static NO_COPY wincaps wincap_xp = {
}; };
static NO_COPY wincaps wincap_2003 = { static NO_COPY wincaps wincap_2003 = {
lock_file_highword:0xffffffff, lock_file_highword:UINT32_MAX,
chunksize:0, chunksize:0,
shared:FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, shared:FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
is_winnt:true, is_winnt:true,