1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00

Mon Mar 20 03:19:23 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>

* stdio/vfscanf.c (%n): Use READ_IN - 1, so as not to count the
 	read-ahead character.

	* hurd/dtable.c, hurd/getdport.c, hurd/hurd.h, hurd/hurdexec.c,
	  hurd/hurdinit.c, hurd/hurdprio.c, hurd/hurdsock.c,
	  hurd/ports-get.c, hurd/ports-set.c, hurd/setauth.c,
	  hurd/setuids.c, sysdeps/mach/hurd/i386/trampoline.c:
	Get anal with unsigned to pacify compiler.
This commit is contained in:
Roland McGrath
1995-03-20 08:21:38 +00:00
parent be69ea41eb
commit 1e9dc0393c
14 changed files with 30 additions and 20 deletions

View File

@ -1,5 +1,16 @@
Mon Mar 20 03:19:23 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* stdio/vfscanf.c (%n): Use READ_IN - 1, so as not to count the
read-ahead character.
Sat Mar 18 14:07:08 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu> Sat Mar 18 14:07:08 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* hurd/dtable.c, hurd/getdport.c, hurd/hurd.h, hurd/hurdexec.c,
hurd/hurdinit.c, hurd/hurdprio.c, hurd/hurdsock.c,
hurd/ports-get.c, hurd/ports-set.c, hurd/setauth.c,
hurd/setuids.c, sysdeps/mach/hurd/i386/trampoline.c:
Get anal with unsigned to pacify compiler.
* stdio/vfscanf.c: Grok positional parameter specs (i.e. %3$d * stdio/vfscanf.c: Grok positional parameter specs (i.e. %3$d
means %d from 3rd arg). means %d from 3rd arg).

View File

@ -41,7 +41,7 @@ DEFINE_HOOK (_hurd_fd_subinit, (void));
static void static void
init_dtable (void) init_dtable (void)
{ {
register size_t i; int i;
__mutex_init (&_hurd_dtable_lock); __mutex_init (&_hurd_dtable_lock);
@ -55,7 +55,7 @@ init_dtable (void)
__libc_fatal ("hurd: Can't allocate file descriptor table\n"); __libc_fatal ("hurd: Can't allocate file descriptor table\n");
/* Initialize the descriptor table. */ /* Initialize the descriptor table. */
for (i = 0; i < _hurd_init_dtablesize; ++i) for (i = 0; (unsigned int) i < _hurd_init_dtablesize; ++i)
{ {
if (_hurd_init_dtable[i] == MACH_PORT_NULL) if (_hurd_init_dtable[i] == MACH_PORT_NULL)
/* An unused descriptor is marked by a null pointer. */ /* An unused descriptor is marked by a null pointer. */

View File

@ -37,7 +37,7 @@ __getdport (int fd)
/* Never had a descriptor table. */ /* Never had a descriptor table. */
return EBADF; return EBADF;
if (fd < 0 || fd > _hurd_init_dtablesize || if (fd < 0 || (unsigned int) fd > _hurd_init_dtablesize ||
_hurd_init_dtable[fd] == MACH_PORT_NULL) _hurd_init_dtable[fd] == MACH_PORT_NULL)
{ {
errno = EBADF; errno = EBADF;

View File

@ -109,8 +109,8 @@ extern int _hurd_set_brk (vm_address_t newbrk);
/* Calls to get and set basic ports. */ /* Calls to get and set basic ports. */
extern error_t _hurd_ports_get (int which, mach_port_t *result); extern error_t _hurd_ports_get (unsigned int which, mach_port_t *result);
extern error_t _hurd_ports_set (int which, mach_port_t newport); extern error_t _hurd_ports_set (unsigned int which, mach_port_t newport);
extern process_t getproc (void); extern process_t getproc (void);
extern file_t getcwdir (void), getcrdir (void); extern file_t getcwdir (void), getcrdir (void);

View File

@ -40,10 +40,9 @@ _hurd_exec (task_t task, file_t file,
mach_port_t ports[_hurd_nports]; mach_port_t ports[_hurd_nports];
struct hurd_userlink ulink_ports[_hurd_nports]; struct hurd_userlink ulink_ports[_hurd_nports];
file_t *dtable; file_t *dtable;
int dtablesize; unsigned int dtablesize, i;
struct hurd_port **dtable_cells; struct hurd_port **dtable_cells;
struct hurd_userlink *ulink_dtable; struct hurd_userlink *ulink_dtable;
int i;
char *const *p; char *const *p;
struct hurd_sigstate *ss; struct hurd_sigstate *ss;
mach_port_t *please_dealloc, *pdp; mach_port_t *please_dealloc, *pdp;

View File

@ -45,7 +45,7 @@ _hurd_init (int flags, char **argv,
mach_port_t *portarray, size_t portarraysize, mach_port_t *portarray, size_t portarraysize,
int *intarray, size_t intarraysize) int *intarray, size_t intarraysize)
{ {
int i; size_t i;
_hurd_exec_flags = flags; _hurd_exec_flags = flags;

View File

@ -67,7 +67,7 @@ _hurd_priority_which_map (enum __priority_which which, int who,
(vm_address_t) oldpi, oldpisize * sizeof pi[0]); (vm_address_t) oldpi, oldpisize * sizeof pi[0]);
pip = (struct procinfo *) pi; pip = (struct procinfo *) pi;
if (pip->owner != who) if (pip->owner != (uid_t) who)
continue; continue;
} }
else else

View File

@ -103,7 +103,7 @@ _hurd_socket_server (int domain, int dead)
static void static void
init (void) init (void)
{ {
size_t i; int i;
__mutex_init (&lock); __mutex_init (&lock);

View File

@ -1,4 +1,4 @@
/* Copyright (C) 1994 Free Software Foundation, Inc. /* Copyright (C) 1994, 1995 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -32,9 +32,9 @@ error_t (*_hurd_ports_getters[INIT_PORT_MAX]) (mach_port_t *result) =
}; };
error_t error_t
_hurd_ports_get (int which, mach_port_t *result) _hurd_ports_get (unsigned int which, mach_port_t *result)
{ {
if (which < 0 || which >= _hurd_nports) if (which >= _hurd_nports)
return EINVAL; return EINVAL;
if (which >= INIT_PORT_MAX || _hurd_ports_getters[which] == NULL) if (which >= INIT_PORT_MAX || _hurd_ports_getters[which] == NULL)
return HURD_PORT_USE (&_hurd_ports[which], return HURD_PORT_USE (&_hurd_ports[which],

View File

@ -1,4 +1,4 @@
/* Copyright (C) 1994 Free Software Foundation, Inc. /* Copyright (C) 1994, 1995 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -40,10 +40,10 @@ error_t (*_hurd_ports_setters[INIT_PORT_MAX]) (mach_port_t newport) =
error_t error_t
_hurd_ports_set (int which, mach_port_t newport) _hurd_ports_set (unsigned int which, mach_port_t newport)
{ {
error_t err; error_t err;
if (which < 0 || which >= _hurd_nports) if (which >= _hurd_nports)
return EINVAL; return EINVAL;
if (err = __mach_port_mod_refs (__mach_task_self (), newport, if (err = __mach_port_mod_refs (__mach_task_self (), newport,
MACH_PORT_RIGHT_SEND, 1)) MACH_PORT_RIGHT_SEND, 1))

View File

@ -34,7 +34,7 @@ error_t
_hurd_setauth (auth_t new) _hurd_setauth (auth_t new)
{ {
error_t err; error_t err;
int d; unsigned int d;
mach_port_t newport, ref; mach_port_t newport, ref;
/* Give the new send right a user reference. /* Give the new send right a user reference.

View File

@ -25,7 +25,7 @@ setuids (int n, const uid_t *uids)
{ {
error_t err; error_t err;
auth_t newauth; auth_t newauth;
size_t i; int i;
gid_t new[n]; gid_t new[n];
/* Fault before taking locks. */ /* Fault before taking locks. */

View File

@ -251,7 +251,7 @@ DEFUN(__vfscanf, (s, format, arg),
case 'n': /* Answer number of assignments done. */ case 'n': /* Answer number of assignments done. */
if (do_assign) if (do_assign)
*ARG (int *) = read_in; *ARG (int *) = read_in - 1; /* Don't count the read-ahead. */
break; break;
case 'c': /* Match characters. */ case 'c': /* Match characters. */

View File

@ -254,7 +254,7 @@ _hurdsig_rcv_interrupted_p (struct machine_thread_all_state *state,
if (_hurdsig_catch_fault (SIGSEGV)) if (_hurdsig_catch_fault (SIGSEGV))
assert (_hurdsig_fault_sigcode >= (long int) pc && assert (_hurdsig_fault_sigcode >= (long int) pc &&
_hurdsig_fault_sigcode < (long int) pc + sizeof syscall); _hurdsig_fault_sigcode < (long int) (pc + sizeof syscall));
else else
{ {
int rcving = (state->basic.eax == MACH_RCV_INTERRUPTED && int rcving = (state->basic.eax == MACH_RCV_INTERRUPTED &&