Changeset 473 for trunk/libs/mini-libc

Timestamp:

Aug 21, 2018, 6:01:01 PM (6 years ago)

Author:

alain

Message:

Fix several GCC warning related to the -Wextra compilation option.

Location:

trunk/libs/mini-libc

Files:

• dirent.c (modified) (1 diff)
• mman.c (modified) (1 diff)
• stdio.c (modified) (4 diffs)
• stdio.h (modified) (1 diff)
• stdlib.c (modified) (3 diffs)
• stdlib.h (modified) (1 diff)
• string.c (modified) (1 diff)
• unistd.c (modified) (1 diff)

trunk/libs/mini-libc/dirent.c

@@ -26 +26 @@
 #include <hal_user.h>
 #include <syscalls_numbers.h>
+#include <stdio.h>
 
 //////////////////////////////////////

trunk/libs/mini-libc/mman.c

@@ -26 +26 @@
 #include <hal_user.h>
 #include <syscalls_numbers.h>
+#include <stdio.h>
 
 ////////////////////////////////y

trunk/libs/mini-libc/stdio.c

@@ -38 +38 @@
 ////////////////////////////////////////////////////////////////////////////////////////
 
-//////////////////////////////////////////
-static int xprintf( char         * string,
-                    unsigned int   length,
-                    const char   * format, 
-                    va_list      * args ) 
+///////////////////////////////////////////////////
+static unsigned int xprintf( char         * string,
+                             unsigned int   length,
+                             const char   * format, 
+                             va_list      * args ) 
 {
     unsigned int ps = 0;    // write index to the string buffer
@@ -265 +265 @@
 int printf( const char * format, ... )
 {
-    char      string[4096];
-    va_list   args;
-    int       count;
+    char               string[4096];
+    va_list            args;
+    unsigned int       count;
     
     va_start( args, format );
@@ -309 +309 @@
               const char     * format, ... )
 {
-    va_list   args;
-    int       count;
+    va_list            args;
+    unsigned int       count;
 
     va_start( args, format );
@@ -374 +374 @@
              const char * format, ... )
 {
-    char      string[4096];
-    va_list   args;
-    int       count;
-    int       fd;
+    char               string[4096];
+    va_list            args;
+    unsigned int       count;
+    int                fd;
     
     // check stream valid

trunk/libs/mini-libc/stdio.h

@@ -31 +31 @@
  ********************************************************************************************/
 
-/*********************************************************************************************
- * This defines the user level FILE structure.
- ********************************************************************************************/
-
 #define  MAX_OPEN_FILE_PER_PROCESS  256
 #define  VALID_OPEN_FILE            0x12345678
 #define  EOF                        -1
 #define  NULL                       (void *)0
+
+/*********************************************************************************************
+ * This defines the user level FILE structure.
+ ********************************************************************************************/
 
 typedef struct file_s

trunk/libs/mini-libc/stdlib.c

@@ -28 +28 @@
 #include <almosmkh.h>
 #include <stdio.h>
+
+////////////////////////////////////////////////////////////////////////////////////////// 
+//           Global variables                   
+//////////////////////////////////////////////////////////////////////////////////////////
+
+unsigned int  rand_seed_value = 1;   // set by srand() , used by rand()
 
 //////////////////////////
@@ -121 +127 @@
     get_cycle( &cycle );
 
-    unsigned int x = (unsigned int)cycle;
-
-    if ((x & 0xF) > 7) 
-    {
-        return (x*x & 0xFFFF);
+    unsigned int x = (unsigned int)cycle * rand_seed_value;
+
+    if ((x & 0xFF) > 0x7F) 
+    {
+        return (x*x & RAND_MAX);
     }
     else 
     {
-        return (x*x*x & 0xFFFF);
+        return (x*x*x & RAND_MAX);
     }
 }
@@ -136 +142 @@
 void srand( unsigned int seed )
 {
-    printf("\n[ERROR] in %s : not implemented yet : do nothing\n", __FUNCTION__ );
+    rand_seed_value = seed;
 }
 

trunk/libs/mini-libc/stdlib.h

@@ -33 +33 @@
 
 #include <shared_stdlib.h>
+
+#define  RAND_MAX       0xFFFF
 
 /***************************************************************************************** 

trunk/libs/mini-libc/string.c

@@ -22 +22 @@
  */
 
-#define  NULL  (void *)0
-
 #include <string.h>
+#include <stdio.h>
 
 ///////////////////////////////////////

trunk/libs/mini-libc/unistd.c

@@ -78 +78 @@
 int pipe( int fd[2] )
 {
-    return -1;
-    //return hal_user_syscall( SYS_PIPE, (reg_t)fd, 0, 0, 0 );
+    return hal_user_syscall( SYS_PIPE, 
+                             (reg_t)fd, 0, 0, 0 );
 }