* sem.cc (semget): Fix debug string.

(semop): Ditto.
	* shm.cc (fixup_shms_after_fork): Ditto.
	(shmat): Ditto.
	(shmdt): Ditto.
	(shmget): Ditto.
This commit is contained in:
Corinna Vinschen 2004-03-26 16:24:24 +00:00
parent 85427a949a
commit 6b0d86c56d
3 changed files with 16 additions and 7 deletions

View File

@ -1,3 +1,12 @@
2004-03-26 Corinna Vinschen <corinna@vinschen.de>
* sem.cc (semget): Fix debug string.
(semop): Ditto.
* shm.cc (fixup_shms_after_fork): Ditto.
(shmat): Ditto.
(shmdt): Ditto.
(shmget): Ditto.
2004-03-26 Christopher Faylor <cgf@redhat.com> 2004-03-26 Christopher Faylor <cgf@redhat.com>
* sigproc.cc (wait_sig): Make sure that SIGCHLD is handled regardless * sigproc.cc (wait_sig): Make sure that SIGCHLD is handled regardless

View File

@ -136,7 +136,7 @@ semget (key_t key, int nsems, int semflg)
client_request_sem request (key, nsems, semflg); client_request_sem request (key, nsems, semflg);
if (request.make_request () == -1 || request.retval () == -1) if (request.make_request () == -1 || request.retval () == -1)
{ {
syscall_printf ("-1 [%d] = semctl ()", request.error_code ()); syscall_printf ("-1 [%d] = semget ()", request.error_code ());
set_errno (request.error_code ()); set_errno (request.error_code ());
if (request.error_code () == ENOSYS) if (request.error_code () == ENOSYS)
raise (SIGSYS); raise (SIGSYS);
@ -161,7 +161,7 @@ semop (int semid, struct sembuf *sops, size_t nsops)
client_request_sem request (semid, sops, nsops); client_request_sem request (semid, sops, nsops);
if (request.make_request () == -1 || request.retval () == -1) if (request.make_request () == -1 || request.retval () == -1)
{ {
syscall_printf ("-1 [%d] = semctl ()", request.error_code ()); syscall_printf ("-1 [%d] = semop ()", request.error_code ());
set_errno (request.error_code ()); set_errno (request.error_code ());
if (request.error_code () == ENOSYS) if (request.error_code () == ENOSYS)
raise (SIGSYS); raise (SIGSYS);

View File

@ -124,7 +124,7 @@ fixup_shms_after_fork ()
client_request_shm request (&parent); client_request_shm request (&parent);
if (request.make_request () == -1 || request.retval () == -1) if (request.make_request () == -1 || request.retval () == -1)
{ {
syscall_printf ("-1 [%d] = shmctl ()", request.error_code ()); syscall_printf ("-1 [%d] = fixup_shms_after_fork ()", request.error_code ());
set_errno (request.error_code ()); set_errno (request.error_code ());
return 0; return 0;
} }
@ -200,7 +200,7 @@ shmat (int shmid, const void *shmaddr, int shmflg)
client_request_shm request (shmid, ptr, shmflg & ~SHM_RND); client_request_shm request (shmid, ptr, shmflg & ~SHM_RND);
if (request.make_request () == -1 || request.ptrval () == NULL) if (request.make_request () == -1 || request.ptrval () == NULL)
{ {
syscall_printf ("-1 [%d] = shmctl ()", request.error_code ()); syscall_printf ("-1 [%d] = shmat ()", request.error_code ());
UnmapViewOfFile (ptr); UnmapViewOfFile (ptr);
delete sph_entry; delete sph_entry;
set_errno (request.error_code ()); set_errno (request.error_code ());
@ -286,11 +286,11 @@ extern "C" int
shmdt (const void *shmaddr) shmdt (const void *shmaddr)
{ {
#ifdef USE_SERVER #ifdef USE_SERVER
syscall_printf ("shmget (shmaddr = %p)", shmaddr); syscall_printf ("shmdt (shmaddr = %p)", shmaddr);
client_request_shm request (shmaddr); client_request_shm request (shmaddr);
if (request.make_request () == -1 || request.retval () == -1) if (request.make_request () == -1 || request.retval () == -1)
{ {
syscall_printf ("-1 [%d] = shmctl ()", request.error_code ()); syscall_printf ("-1 [%d] = shmdt ()", request.error_code ());
set_errno (request.error_code ()); set_errno (request.error_code ());
if (request.error_code () == ENOSYS) if (request.error_code () == ENOSYS)
raise (SIGSYS); raise (SIGSYS);
@ -333,7 +333,7 @@ shmget (key_t key, size_t size, int shmflg)
client_request_shm request (key, size, shmflg); client_request_shm request (key, size, shmflg);
if (request.make_request () == -1 || request.retval () == -1) if (request.make_request () == -1 || request.retval () == -1)
{ {
syscall_printf ("-1 [%d] = shmctl ()", request.error_code ()); syscall_printf ("-1 [%d] = shmget ()", request.error_code ());
delete ssh_new_entry; delete ssh_new_entry;
set_errno (request.error_code ()); set_errno (request.error_code ());
if (request.error_code () == ENOSYS) if (request.error_code () == ENOSYS)