frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use strerror instead of errno values in user strings.

This commit is contained in:
Adam Jackson 2008-02-01 15:36:11 +11:00
parent b740b865e4
commit f3b3b37ec6
12 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Xext/xf86bigfont.c
View File

@ -236,15 +236,15 @@ shmalloc(
size = (size + pagesize-1) & -pagesize; size = (size + pagesize-1) & -pagesize;
shmid = shmget(IPC_PRIVATE, size, S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH); shmid = shmget(IPC_PRIVATE, size, S_IWUSR | S_IRUSR | S_IRGRP | S_IROTH);
if (shmid == -1) { if (shmid == -1) {
ErrorF(XF86BIGFONTNAME " extension: shmget() failed, size = %u, errno = %d\n", ErrorF(XF86BIGFONTNAME " extension: shmget() failed, size = %u, %s\n",
size, errno); size, strerror(errno));
xfree(pDesc); xfree(pDesc);
return (ShmDescPtr) NULL; return (ShmDescPtr) NULL;
} }
if ((addr = shmat(shmid, 0, 0)) == (char *)-1) { if ((addr = shmat(shmid, 0, 0)) == (char *)-1) {
ErrorF(XF86BIGFONTNAME " extension: shmat() failed, size = %u, errno = %d\n", ErrorF(XF86BIGFONTNAME " extension: shmat() failed, size = %u, %s\n",
size, errno); size, strerror(errno));
shmctl(shmid, IPC_RMID, (void *) 0); shmctl(shmid, IPC_RMID, (void *) 0);
xfree(pDesc); xfree(pDesc);
return (ShmDescPtr) NULL; return (ShmDescPtr) NULL;

2
hw/dmx/examples/ev.c
View File

@ -174,7 +174,7 @@ int main(int argc, char **argv)
} }
printf("\n"); printf("\n");
} }
printf("rc = %d, errno = %d (%s)\n", rc, errno, strerror(errno)); printf("rc = %d, (%s)\n", rc, strerror(errno));
close(fd); close(fd);
} }
} }

2
hw/kdrive/linux/linux.c
View File

@ -441,7 +441,7 @@ LinuxFini (void)
memset (&vts, '\0', sizeof (vts)); /* valgrind */ memset (&vts, '\0', sizeof (vts)); /* valgrind */
ioctl (fd, VT_GETSTATE, &vts); ioctl (fd, VT_GETSTATE, &vts);
if (ioctl (fd, VT_DISALLOCATE, vtno) < 0) if (ioctl (fd, VT_DISALLOCATE, vtno) < 0)
fprintf (stderr, "Can't deallocate console %d errno %d\n", vtno, errno); fprintf (stderr, "Can't deallocate console %d %s\n", vtno, strerror(errno));
close (fd); close (fd);
} }
return; return;

8
hw/kdrive/src/kmap.c
View File

@ -132,8 +132,8 @@ KdSetMappedMode (CARD32 addr, CARD32 size, int mode)
sentry.type = type; sentry.type = type;
if (ioctl (mtrr, MTRRIOC_ADD_ENTRY, &sentry) < 0) if (ioctl (mtrr, MTRRIOC_ADD_ENTRY, &sentry) < 0)
ErrorF ("MTRRIOC_ADD_ENTRY failed 0x%x 0x%x %d (errno %d)\n", ErrorF ("MTRRIOC_ADD_ENTRY failed 0x%x 0x%x %d (%s)\n",
base, bound - base, type, errno); base, bound - base, type, strerror(errno));
} }
#endif #endif
} }
@ -171,8 +171,8 @@ KdResetMappedMode (CARD32 addr, CARD32 size, int mode)
sentry.type = type; sentry.type = type;
if (ioctl (mtrr, MTRRIOC_DEL_ENTRY, &sentry) < 0) if (ioctl (mtrr, MTRRIOC_DEL_ENTRY, &sentry) < 0)
ErrorF ("MTRRIOC_DEL_ENTRY failed 0x%x 0x%x %d (errno %d)\n", ErrorF ("MTRRIOC_DEL_ENTRY failed 0x%x 0x%x %d (%s)\n",
base, bound - base, type, errno); base, bound - base, type, strerror(errno));
} }
#endif #endif
} }

2
hw/kdrive/vesa/vm86.c
View File

@ -567,7 +567,7 @@ vm86_loop(Vm86InfoPtr vi)
if(errno == ENOSYS) { if(errno == ENOSYS) {
ErrorF("No vm86 support. Are you running on AMD64?\n"); ErrorF("No vm86 support. Are you running on AMD64?\n");
} else { } else {
ErrorF("vm86 failed (errno = %d).\n", errno); ErrorF("vm86 failed (%s).\n", strerror(errno));
Vm86Debug(vi); Vm86Debug(vi);
} }
} else { } else {

18
hw/vfb/InitOutput.c
View File

@ -179,8 +179,8 @@ ddxGiveUp()
if (-1 == unlink(vfbScreens[i].mmap_file)) if (-1 == unlink(vfbScreens[i].mmap_file))
{ {
perror("unlink"); perror("unlink");
ErrorF("unlink %s failed, errno %d", ErrorF("unlink %s failed, %s",
vfbScreens[i].mmap_file, errno); vfbScreens[i].mmap_file, strerror(errno));
} }
} }
break; break;
@ -196,7 +196,7 @@ ddxGiveUp()
if (-1 == shmdt((char *)vfbScreens[i].pXWDHeader)) if (-1 == shmdt((char *)vfbScreens[i].pXWDHeader))
{ {
perror("shmdt"); perror("shmdt");
ErrorF("shmdt failed, errno %d", errno); ErrorF("shmdt failed, %s", strerror(errno));
} }
} }
break; break;
@ -582,7 +582,7 @@ vfbBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadmask)
#endif #endif
{ {
perror("msync"); perror("msync");
ErrorF("msync failed, errno %d", errno); ErrorF("msync failed, %s", strerror(errno));
} }
} }
} }
@ -605,7 +605,7 @@ vfbAllocateMmappedFramebuffer(vfbScreenInfoPtr pvfb)
if (-1 == (pvfb->mmap_fd = open(pvfb->mmap_file, O_CREAT|O_RDWR, 0666))) if (-1 == (pvfb->mmap_fd = open(pvfb->mmap_file, O_CREAT|O_RDWR, 0666)))
{ {
perror("open"); perror("open");
ErrorF("open %s failed, errno %d", pvfb->mmap_file, errno); ErrorF("open %s failed, %s", pvfb->mmap_file, strerror(errno));
return; return;
} }
@ -621,7 +621,7 @@ vfbAllocateMmappedFramebuffer(vfbScreenInfoPtr pvfb)
if (-1 == write(pvfb->mmap_fd, dummyBuffer, writeThisTime)) if (-1 == write(pvfb->mmap_fd, dummyBuffer, writeThisTime))
{ {
perror("write"); perror("write");
ErrorF("write %s failed, errno %d", pvfb->mmap_file, errno); ErrorF("write %s failed, %s", pvfb->mmap_file, strerror(errno));
return; return;
} }
} }
@ -635,7 +635,7 @@ vfbAllocateMmappedFramebuffer(vfbScreenInfoPtr pvfb)
if (-1 == (long)pvfb->pXWDHeader) if (-1 == (long)pvfb->pXWDHeader)
{ {
perror("mmap"); perror("mmap");
ErrorF("mmap %s failed, errno %d", pvfb->mmap_file, errno); ErrorF("mmap %s failed, %s", pvfb->mmap_file, strerror(errno));
pvfb->pXWDHeader = NULL; pvfb->pXWDHeader = NULL;
return; return;
} }
@ -659,7 +659,7 @@ vfbAllocateSharedMemoryFramebuffer(vfbScreenInfoPtr pvfb)
if (pvfb->shmid < 0) if (pvfb->shmid < 0)
{ {
perror("shmget"); perror("shmget");
ErrorF("shmget %d bytes failed, errno %d", pvfb->sizeInBytes, errno); ErrorF("shmget %d bytes failed, %s", pvfb->sizeInBytes, strerror(errno));
return; return;
} }
@ -669,7 +669,7 @@ vfbAllocateSharedMemoryFramebuffer(vfbScreenInfoPtr pvfb)
if (-1 == (long)pvfb->pXWDHeader) if (-1 == (long)pvfb->pXWDHeader)
{ {
perror("shmat"); perror("shmat");
ErrorF("shmat failed, errno %d", errno); ErrorF("shmat failed, %s", strerror(errno));
pvfb->pXWDHeader = NULL; pvfb->pXWDHeader = NULL;
return; return;
} }

2
hw/xfree86/os-support/bsd/bsd_apm.c
View File

@ -66,7 +66,7 @@ bsdPMGetEventFromOS(int fd, pmEvent *events, int num)
if (ioctl(fd, APM_IOC_NEXTEVENT, &bsdEvent) < 0) { if (ioctl(fd, APM_IOC_NEXTEVENT, &bsdEvent) < 0) {
if (errno != EAGAIN) { if (errno != EAGAIN) {
xf86Msg(X_WARNING, "bsdPMGetEventFromOS: APM_IOC_NEXTEVENT" xf86Msg(X_WARNING, "bsdPMGetEventFromOS: APM_IOC_NEXTEVENT"
" errno = %d\n", errno); " %s\n", strerror(errno));
} }
break; break;
} }

2
hw/xfree86/os-support/bsd/bsd_kqueue_apm.c
View File

@ -102,7 +102,7 @@ bsdPMGetEventFromOS(int kq, pmEvent *events, int num)
break; break;
} else if (result < 0) { } else if (result < 0) {
xf86Msg(X_WARNING, "bsdPMGetEventFromOS: kevent returns" xf86Msg(X_WARNING, "bsdPMGetEventFromOS: kevent returns"
" errno = %d\n", errno); " %s\n", strerror(errno));
break; break;
} }
events[i] = bsdToXF86(APM_EVENT_TYPE(ev.data)); events[i] = bsdToXF86(APM_EVENT_TYPE(ev.data));

6
hw/xfree86/os-support/solaris/sun_apm.c
View File

@ -149,7 +149,7 @@ sunPMGetEventFromOS(int fd, pmEvent *events, int num)
if (ioctl(fd, APM_IOC_NEXTEVENT, &sunEvent) < 0) { if (ioctl(fd, APM_IOC_NEXTEVENT, &sunEvent) < 0) {
if (errno != EAGAIN) { if (errno != EAGAIN) {
xf86Msg(X_WARNING, "sunPMGetEventFromOS: APM_IOC_NEXTEVENT" xf86Msg(X_WARNING, "sunPMGetEventFromOS: APM_IOC_NEXTEVENT"
" errno = %d\n", errno); " %s\n", strerror(errno));
} }
break; break;
} }
@ -178,7 +178,7 @@ sunPMConfirmEventToOs(int fd, pmEvent event)
return PM_CONTINUE; return PM_CONTINUE;
else { else {
xf86Msg(X_WARNING, "sunPMConfirmEventToOs: APM_IOC_SUSPEND" xf86Msg(X_WARNING, "sunPMConfirmEventToOs: APM_IOC_SUSPEND"
" errno = %d\n", errno); " %s\n", strerror(errno));
return PM_FAILED; return PM_FAILED;
} }
case XF86_APM_STANDBY_RESUME: case XF86_APM_STANDBY_RESUME:
@ -191,7 +191,7 @@ sunPMConfirmEventToOs(int fd, pmEvent event)
return PM_CONTINUE; return PM_CONTINUE;
else { else {
xf86Msg(X_WARNING, "sunPMConfirmEventToOs: APM_IOC_RESUME" xf86Msg(X_WARNING, "sunPMConfirmEventToOs: APM_IOC_RESUME"
" errno = %d\n", errno); " %s\n", strerror(errno));
return PM_FAILED; return PM_FAILED;
} }
default: default:

2
hw/xprint/ps/psout_ftpstype1.c
View File

@ -124,7 +124,7 @@ int PsOut_DownloadFreeType1(PsOutPtr self, const char *psfontname, FontPtr pFont
switch(childpid) switch(childpid)
{ {
case -1: case -1:
FatalError("PS DDX internal error: Cannot fork() converter child process, errno=%d\n", (int)errno); FatalError("PS DDX internal error: Cannot fork() converter child process, %s\n", strerror(errno));
break; break;
case 0: /* child */ case 0: /* child */
fclose(self->Fp); fclose(self->Fp);

12
hw/xquartz/darwinKeyboard.c
View File

@ -344,13 +344,13 @@ static Bool DarwinReadKeymapFile(NXKeyMapping *keyMap) {
fref = fopen( darwinKeymapFile, "rb" ); fref = fopen( darwinKeymapFile, "rb" );
if (fref == NULL) { if (fref == NULL) {
ErrorF("Unable to open keymapping file '%s' (errno %d).\n", ErrorF("Unable to open keymapping file '%s' (%s).\n",
darwinKeymapFile, errno); darwinKeymapFile, strerror(errno));
return FALSE; return FALSE;
} }
if (fstat(fileno(fref), &st) == -1) { if (fstat(fileno(fref), &st) == -1) {
ErrorF("Could not stat keymapping file '%s' (errno %d).\n", ErrorF("Could not stat keymapping file '%s' (%s).\n",
darwinKeymapFile, errno); darwinKeymapFile, strerror(errno));
return FALSE; return FALSE;
} }
@ -364,8 +364,8 @@ static Bool DarwinReadKeymapFile(NXKeyMapping *keyMap) {
inBuffer = (char*) xalloc( st.st_size ); inBuffer = (char*) xalloc( st.st_size );
bufferEnd = (int *) (inBuffer + st.st_size); bufferEnd = (int *) (inBuffer + st.st_size);
if (fread(inBuffer, st.st_size, 1, fref) != 1) { if (fread(inBuffer, st.st_size, 1, fref) != 1) {
ErrorF("Could not read %qd bytes from keymapping file '%s' (errno %d).\n", ErrorF("Could not read %qd bytes from keymapping file '%s' (%s).\n",
st.st_size, darwinKeymapFile, errno); st.st_size, darwinKeymapFile, strerror(errno));
return FALSE; return FALSE;
} }

8
os/WaitFor.c
View File

@ -254,13 +254,13 @@ WaitForSomething(int *pClientsReady)
} }
else if (selecterr == EINVAL) else if (selecterr == EINVAL)
{ {
FatalError("WaitForSomething(): select: errno=%d\n", FatalError("WaitForSomething(): select: %s\n",
selecterr); strerror(selecterr));
} }
else if (selecterr != EINTR && selecterr != EAGAIN) else if (selecterr != EINTR && selecterr != EAGAIN)
{ {
ErrorF("WaitForSomething(): select: errno=%d\n", ErrorF("WaitForSomething(): select: %s\n",
selecterr); strerror(selecterr));
} }
} }
#ifdef SMART_SCHEDULE #ifdef SMART_SCHEDULE