Changes in / [22e6802:65c1778] in mainline

Files:

• kernel/generic/src/syscall/syscall.c (modified) (2 diffs)
• uspace/lib/libc/generic/io/io.c (modified) (3 diffs)

kernel/generic/src/syscall/syscall.c

@@ -62 +62 @@
 
 #ifdef CONFIG_UDEBUG
-        bool debug;
-
         /*
          * Early check for undebugged tasks. We do not lock anything as this
-         * test need not be precise in either way.
+         * test need not be precise in either direction.
          */
-        debug = THREAD->udebug.active;
-        
-        if (debug) {
+        if (THREAD->udebug.active) {
                 udebug_syscall_event(a1, a2, a3, a4, a5, a6, id, 0, false);
         }
@@ -87 +83 @@
         
 #ifdef CONFIG_UDEBUG
-        if (debug) {
+        if (THREAD->udebug.active) {
                 udebug_syscall_event(a1, a2, a3, a4, a5, a6, id, rc, true);
         

uspace/lib/libc/generic/io/io.c

@@ -341 +341 @@
 size_t fread(void *buf, size_t size, size_t nmemb, FILE *stream)
 {
-        size_t left = size * nmemb;
-        size_t done = 0;
-        
+        size_t left, done;
+
+        if (size == 0 || nmemb == 0)
+                return 0;
+
         /* Make sure no data is pending write. */
         _fflushbuf(stream);
+
+        left = size * nmemb;
+        done = 0;
         
         while ((left > 0) && (!stream->error) && (!stream->eof)) {
@@ -365 +370 @@
 static size_t _fwrite(const void *buf, size_t size, size_t nmemb, FILE *stream)
 {
-        size_t left = size * nmemb;
-        size_t done = 0;
-        
+        size_t left;
+        size_t done;
+
+        if (size == 0 || nmemb == 0)
+                return 0;
+
+        left = size * nmemb;
+        done = 0;
+
         while ((left > 0) && (!stream->error)) {
                 ssize_t wr;
@@ -421 +432 @@
         uint8_t b;
         bool need_flush;
-        
+
+        if (size == 0 || nmemb == 0)
+                return 0;
+
         /* If not buffered stream, write out directly. */
         if (stream->btype == _IONBF) {