Changeset 2647
- Timestamp:
- Mar 15, 2006, 4:10:55 AM (19 years ago)
- Location:
- branches/libc-0.6/src/emx
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/libc-0.6/src/emx/ChangeLog.LIBC
r2646 r2647 5 5 2006-03-14: knut st. osmundsen <bird-gccos2-spam@anduin.net> 6 6 - libc: 7 o __read & __write logging, and added support for more size flags to the log formatter. 7 8 o #68: Implemented the _GETOPT_DECLARED blocker in getopt.h too. 8 9 -
branches/libc-0.6/src/emx/src/lib/sys/__read.c
r2437 r2647 15 15 #include <emx/syscalls.h> 16 16 #include "syscalls.h" 17 #define __LIBC_LOG_GROUP __LIBC_LOG_GRP_BACK_IO 18 #include <InnoTekLIBC/logstrict.h> 17 19 18 20 int __read (int handle, void *buf, size_t cbToRead) 19 21 { 22 LIBCLOG_ENTER("fd=%d buf=%p cbToRead=%zu\n", handle, buf, cbToRead); 20 23 int rc; 21 24 PLIBCFH pFH; … … 29 32 { 30 33 errno = EBADF; 31 return -1;34 LIBCLOG_ERROR_RETURN_INT(-1); 32 35 } 33 36 … … 50 53 pvBuf_safe = _lmalloc(cbToRead); 51 54 if (!pvBuf_safe) 52 return ERROR_NOT_ENOUGH_MEMORY; 55 { 56 errno = ENOMEM; 57 LIBCLOG_ERROR_RETURN_INT(-1); 58 } 53 59 memcpy(pvBuf_safe, buf, cbToRead); 54 60 } … … 89 95 rc = -EBADF; 90 96 errno = -rc; 91 return -1;97 LIBCLOG_ERROR_RETURN_INT(-1); 92 98 } 93 94 return cbRead; 99 LIBCLOG_RETURN_INT(cbRead); 95 100 } -
branches/libc-0.6/src/emx/src/lib/sys/__write.c
r2437 r2647 15 15 #include <emx/syscalls.h> 16 16 #include "syscalls.h" 17 #define __LIBC_LOG_GROUP __LIBC_LOG_GRP_BACK_IO 18 #include <InnoTekLIBC/logstrict.h> 17 19 18 20 int __write(int handle, const void *buf, size_t cbToWrite) 19 21 { 22 LIBCLOG_ENTER("fd=%d buf=%p cbToWrite=%zu\n", handle, buf, cbToWrite); 20 23 PLIBCFH pFH; 21 24 int rc; … … 32 35 { 33 36 errno = EBADF; 34 return -1;37 LIBCLOG_ERROR_RETURN_INT(-1); 35 38 } 36 39 … … 52 55 pvBuf_safe = _lmalloc(cbToWrite); 53 56 if (!pvBuf_safe) 54 return ERROR_NOT_ENOUGH_MEMORY; 57 { 58 errno = ENOMEM; 59 LIBCLOG_ERROR_RETURN_INT(-1); 60 } 55 61 memcpy(pvBuf_safe, buf, cbToWrite); 56 62 buf = pvBuf_safe; … … 98 104 rc = -EBADF; 99 105 errno = -rc; 100 return -1;106 LIBCLOG_ERROR_RETURN_INT(-1); 101 107 } 102 return cbWritten;108 LIBCLOG_RETURN_INT(cbWritten); 103 109 } 104 110 -
branches/libc-0.6/src/emx/src/lib/sys/logstrict.c
r2260 r2647 1848 1848 /* argsize */ 1849 1849 chArgSize = *pszFormat; 1850 if (chArgSize != 'l' && chArgSize != 'L' && chArgSize != 'H') 1850 if ( chArgSize != 'l' && chArgSize != 'L' && chArgSize != 'h' && chArgSize != 'H' 1851 && chArgSize != 'j' && chArgSize != 'z' && chArgSize != 't') 1851 1852 chArgSize = 0; 1852 else if (*++pszFormat == 'l' && chArgSize == 'l')1853 else 1853 1854 { 1854 chArgSize = 'L';1855 1855 pszFormat++; 1856 if (*pszFormat == 'l' && chArgSize == 'l') 1857 { 1858 chArgSize = 'L'; 1859 pszFormat++; 1860 } 1861 else if (*pszFormat == 'h' && chArgSize == 'h') 1862 { 1863 chArgSize = 'H'; 1864 pszFormat++; 1865 } 1856 1866 } 1857 1867 … … 1988 1998 else if (chArgSize == 'h') 1989 1999 ulValue = va_arg(args, signed /*short*/ int); /* the great GCC pedantically saith use int. */ 2000 else if (chArgSize == 'H') 2001 ulValue = va_arg(args, /* int8_t */ int); /* the great GCC pedantically saith use int. */ 2002 else if (chArgSize == 'j') 2003 ulValue = va_arg(args, intmax_t); 2004 else if (chArgSize == 'z') 2005 ulValue = va_arg(args, size_t); 2006 else if (chArgSize == 't') 2007 ulValue = va_arg(args, ptrdiff_t); 1990 2008 else 1991 2009 ulValue = va_arg(args, signed int);
Note:
See TracChangeset
for help on using the changeset viewer.