diff options
| -rw-r--r-- | winsup/cygserver/ChangeLog | 8 | ||||
| -rw-r--r-- | winsup/cygserver/bsd_helper.cc | 4 | ||||
| -rw-r--r-- | winsup/cygserver/bsd_mutex.cc | 18 | ||||
| -rw-r--r-- | winsup/cygserver/sysv_sem.cc | 2 |
4 files changed, 21 insertions, 11 deletions
diff --git a/winsup/cygserver/ChangeLog b/winsup/cygserver/ChangeLog index 1067b86..c8693ee 100644 --- a/winsup/cygserver/ChangeLog +++ b/winsup/cygserver/ChangeLog @@ -1,5 +1,13 @@ 2008-02-06 Corinna Vinschen <corinna@vinschen.de> + * bsd_helper.cc: Replace %E __small_printf format specifier with %lu + and call to GetLastError throughout. + * bsd_mutex.cc: Ditto. + * sysv_sem.cc (semget): Replace %X __small_printf format specifier + with %llx. + +2008-02-06 Corinna Vinschen <corinna@vinschen.de> + Remove dependency from Cygwin internal code. * Makefile.in (CYGWIN_OBJS): Remove smallprint.o. (cygserver.exe): Remove strfuncs.o diff --git a/winsup/cygserver/bsd_helper.cc b/winsup/cygserver/bsd_helper.cc index 9c6b191..a137b7e 100644 --- a/winsup/cygserver/bsd_helper.cc +++ b/winsup/cygserver/bsd_helper.cc @@ -451,7 +451,7 @@ _vm_pager_allocate (int size, int shmflg) vm_object_t object = CreateFileMapping (INVALID_HANDLE_VALUE, &sec_all_nih, PAGE_READWRITE, 0, size, NULL); if (!object) - panic ("CreateFileMapping in _vm_pager_allocate failed, %E"); + panic ("CreateFileMapping in _vm_pager_allocate failed, %lu", GetLastError ()); return object; } @@ -462,7 +462,7 @@ vm_object_duplicate (struct thread *td, vm_object_t object) if (!DuplicateHandle (GetCurrentProcess (), object, td->client->handle (), &dup_object, 0, TRUE, DUPLICATE_SAME_ACCESS)) - panic ("!DuplicateHandle in vm_object_duplicate failed, %E"); + panic ("!DuplicateHandle in vm_object_duplicate failed, %lu", GetLastError ()); return dup_object; } diff --git a/winsup/cygserver/bsd_mutex.cc b/winsup/cygserver/bsd_mutex.cc index 5e8e543..d4cad56 100644 --- a/winsup/cygserver/bsd_mutex.cc +++ b/winsup/cygserver/bsd_mutex.cc @@ -34,7 +34,7 @@ mtx_init (mtx *m, const char *name, const void *, int) unlockable by the lock owner. */ m->h = CreateSemaphore (NULL, 1, 1, NULL); if (!m->h) - panic ("couldn't allocate %s mutex, %E\n", name); + panic ("couldn't allocate %s mutex, %lu\n", name, GetLastError ()); } void @@ -43,7 +43,8 @@ _mtx_lock (mtx *m, DWORD winpid, const char *file, int line) _log (file, line, LOG_DEBUG, "Try locking mutex %s (%u) (hold: %u)", m->name, winpid, m->owner); if (WaitForSingleObject (m->h, INFINITE) != WAIT_OBJECT_0) - _panic (file, line, "wait for %s in %d failed, %E", m->name, winpid); + _panic (file, line, "wait for %s in %d failed, %lu", m->name, winpid, + GetLastError ()); m->owner = winpid; _log (file, line, LOG_DEBUG, "Locked mutex %s/%u (%u)", m->name, ++m->cnt, winpid); @@ -85,7 +86,8 @@ _mtx_unlock (mtx *m, const char *file, int line) { /* Check if the semaphore was already on it's max value. */ if (GetLastError () != ERROR_TOO_MANY_POSTS) - _panic (file, line, "release of mutex %s failed, %E", m->name); + _panic (file, line, "release of mutex %s failed, %lu", m->name, + GetLastError ()); } _log (file, line, LOG_DEBUG, "Unlocked mutex %s/%u (owner: %u)", m->name, cnt, owner); @@ -199,7 +201,7 @@ class msleep_sync_array a[i].ident = ident; a[i].wakeup_evt = CreateEvent (NULL, TRUE, FALSE, NULL); if (!a[i].wakeup_evt) - panic ("CreateEvent failed: %E"); + panic ("CreateEvent failed: %lu", GetLastError ()); debug ("i = %d, CreateEvent: %x", i, a[i].wakeup_evt); a[i].threads = 1; ++cnt; @@ -282,7 +284,7 @@ msleep_init (void) msleep_glob_evt = CreateEvent (NULL, TRUE, FALSE, NULL); if (!msleep_glob_evt) - panic ("CreateEvent in msleep_init failed: %E"); + panic ("CreateEvent in msleep_init failed: %lu", GetLastError ()); long msgmni = support_msgqueues ? msginfo.msgmni : 0; long semmni = support_semaphores ? seminfo.semmni : 0; TUNABLE_INT_FETCH ("kern.ipc.msgmni", &msgmni); @@ -346,9 +348,9 @@ _msleep (void *ident, struct mtx *mtx, int priority, treat an ERROR_INVALID_HANDLE as a normal process termination and hope for the best. */ if (GetLastError () != ERROR_INVALID_HANDLE) - panic ("wait in msleep (%s) failed, %E", wmesg); - debug ("wait in msleep (%s) failed for %d, %E", wmesg, - td->td_proc->winpid); + panic ("wait in msleep (%s) failed, %lu", wmesg, GetLastError ()); + debug ("wait in msleep (%s) failed for %d, %lu", wmesg, + td->td_proc->winpid, GetLastError ()); ret = EIDRM; break; } diff --git a/winsup/cygserver/sysv_sem.cc b/winsup/cygserver/sysv_sem.cc index 2743315..499c1f9 100644 --- a/winsup/cygserver/sysv_sem.cc +++ b/winsup/cygserver/sysv_sem.cc @@ -875,7 +875,7 @@ semget(struct thread *td, struct semget_args *uap) struct ucred *cred = td->td_ucred; #endif - DPRINTF(("semget(0x%X, %d, 0%o)\n", key, nsems, semflg)); + DPRINTF(("semget(0x%llx, %d, 0%o)\n", key, nsems, semflg)); if (!jail_sysvipc_allowed && jailed(td->td_ucred)) return (ENOSYS); |