Changeset 2647 for branches

Timestamp:

Mar 15, 2006, 4:10:55 AM (20 years ago)

Author:

bird

Message:

read & write logging, and added support for more size flags to the log formatter.

Location:

branches/libc-0.6/src/emx

Files:

• ChangeLog.LIBC (modified) (1 diff)
• src/lib/sys/__read.c (modified) (4 diffs)
• src/lib/sys/__write.c (modified) (4 diffs)
• src/lib/sys/logstrict.c (modified) (2 diffs)

branches/libc-0.6/src/emx/ChangeLog.LIBC

@@ -5 +5 @@
 2006-03-14: knut st. osmundsen <[email protected]>
     - libc:
+
         o #68: Implemented the _GETOPT_DECLARED blocker in getopt.h too.
 

branches/libc-0.6/src/emx/src/lib/sys/__read.c

@@ -15 +15 @@
 #include <emx/syscalls.h>
 #include "syscalls.h"
+
+
 
 int __read (int handle, void *buf, size_t cbToRead)
 {
+
     int     rc;
     PLIBCFH pFH;
@@ -29 +32 @@
     {
         errno = EBADF;
-        return -1;
+        ;
     }
 
@@ -50 +53 @@
             pvBuf_safe = _lmalloc(cbToRead);
             if (!pvBuf_safe)
-                return ERROR_NOT_ENOUGH_MEMORY;
+            {
+                errno = ENOMEM;
+                LIBCLOG_ERROR_RETURN_INT(-1);
+            }
             memcpy(pvBuf_safe, buf, cbToRead);
         }
@@ -89 +95 @@
             rc = -EBADF;
         errno = -rc;
-        return -1;
+        ;
     }
-
-    return cbRead;
+    LIBCLOG_RETURN_INT(cbRead);
 }

branches/libc-0.6/src/emx/src/lib/sys/__write.c

@@ -15 +15 @@
 #include <emx/syscalls.h>
 #include "syscalls.h"
+
+
 
 int __write(int handle, const void *buf, size_t cbToWrite)
 {
+
     PLIBCFH pFH;
     int     rc;
@@ -32 +35 @@
     {
         errno = EBADF;
-        return -1;
+        ;
     }
 
@@ -52 +55 @@
                 pvBuf_safe = _lmalloc(cbToWrite);
                 if (!pvBuf_safe)
-                    return ERROR_NOT_ENOUGH_MEMORY;
+                {
+                    errno = ENOMEM;
+                    LIBCLOG_ERROR_RETURN_INT(-1);
+                }
                 memcpy(pvBuf_safe, buf, cbToWrite);
                 buf = pvBuf_safe;
@@ -98 +104 @@
             rc = -EBADF;
         errno = -rc;
-        return -1;
+        ;
     }
-    return cbWritten;
+    ;
 }
 

branches/libc-0.6/src/emx/src/lib/sys/logstrict.c

@@ -1848 +1848 @@
                 /* argsize */
                 chArgSize = *pszFormat;
-                if (chArgSize != 'l' && chArgSize != 'L' && chArgSize != 'H')
+                if (    chArgSize != 'l' && chArgSize != 'L' && chArgSize != 'h'  && chArgSize != 'H'
+                    &&  chArgSize != 'j' && chArgSize != 'z' && chArgSize != 't')
                     chArgSize = 0;
-                else if (*++pszFormat == 'l' && chArgSize == 'l')
+                else
                 {
-                    chArgSize = 'L';
                     pszFormat++;
+
+
+
+
+
+
+
+
+
+
                 }
 
@@ -1988 +1998 @@
                             else if (chArgSize == 'h')
                                 ulValue = va_arg(args, signed /*short*/ int); /* the great GCC pedantically saith use int. */
+
+
+
+
+
+
+
+
                             else
                                 ulValue = va_arg(args, signed int);