Changeset c718bda in mainline

Timestamp:

2018-01-15T21:40:49Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

dbbbe75b

Parents:

ba29018

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-15 21:20:07)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-15 21:40:49)

Message:

Use standard names for rand() and srand().

Location:

uspace

Files:

• app/tetris/tetris.c (modified) (2 diffs)
• dist/src/c/demos/tetris/tetris.c (modified) (2 diffs)
• lib/c/generic/stdlib.c (modified) (1 diff)
• lib/c/generic/uuid.c (modified) (1 diff)
• lib/c/include/stdlib.h (modified) (1 diff)
• lib/posix/source/stdlib.c (modified) (2 diffs)
• srv/net/tcp/ncsim.c (modified) (2 diffs)

uspace/app/tetris/tetris.c

@@ -156 +156 @@
 const struct shape *randshape(void)
 {
-        const struct shape *tmp = &shapes[random() % 7];
+        const struct shape *tmp = &shapes[rand() % 7];
         int i;
-        int j = random() % 4;
+        int j = rand() % 4;
         
         for (i = 0; i < j; i++)
@@ -171 +171 @@
         
         gettimeofday(&tv, NULL);
-        srandom(tv.tv_sec + tv.tv_usec / 100000);
+        srand(tv.tv_sec + tv.tv_usec / 100000);
 }
 

uspace/dist/src/c/demos/tetris/tetris.c

@@ -157 +157 @@
 const struct shape *randshape(void)
 {
-        const struct shape *tmp = &shapes[random() % 7];
+        const struct shape *tmp = &shapes[rand() % 7];
         int i;
-        int j = random() % 4;
+        int j = rand() % 4;
         
         for (i = 0; i < j; i++)
@@ -172 +172 @@
         
         gettimeofday(&tv, NULL);
-        srandom(tv.tv_sec + tv.tv_usec / 100000);
+        srand(tv.tv_sec + tv.tv_usec / 100000);
 }
 

uspace/lib/c/generic/stdlib.c

@@ -35 +35 @@
 #include <stdlib.h>
 
-static long glbl_seed = 1;
+static int glbl_seed = 1;
 
-long int random(void)
+int rand(void)
 {
         return glbl_seed = ((1366 * glbl_seed + 150889) % RAND_MAX);
 }
 
-void srandom(unsigned int seed)
+void srand(unsigned int seed)
 {
         glbl_seed = seed % RAND_MAX;

uspace/lib/c/generic/uuid.c

@@ -52 +52 @@
         /* XXX This is a rather poor way of generating random numbers */
         gettimeofday(&tv, NULL);
-        srandom(tv.tv_sec ^ tv.tv_usec);
+        srand(tv.tv_sec ^ tv.tv_usec);
 
         for (i = 0; i < uuid_bytes; i++)
-                uuid->b[i] = random();
+                uuid->b[i] = rand();
 
         /* Version 4 UUID from random or pseudo-random numbers */

uspace/lib/c/include/stdlib.h

@@ -42 +42 @@
 #define RAND_MAX  714025
 
-#define rand()       random()
-#define srand(seed)  srandom(seed)
-
-extern long int random(void);
-extern void srandom(unsigned int seed);
+extern int rand(void);
+extern void srand(unsigned int seed);
 
 extern void abort(void) __attribute__((noreturn));

uspace/lib/posix/source/stdlib.c

@@ -377 +377 @@
 int posix_rand(void)
 {
-        return (int) random();
+        return (int) rand();
 }
 
@@ -387 +387 @@
 void posix_srand(unsigned int seed)
 {
-        srandom(seed);
+        srand(seed);
 }
 

uspace/srv/net/tcp/ncsim.c

@@ -81 +81 @@
         return;
 
-        if (0 /*random() % 4 == 3*/) {
+        if (0 /*rand() % 4 == 3*/) {
                 /* Drop segment */
                 log_msg(LOG_DEFAULT, LVL_ERROR, "NCSim dropping segment");
@@ -94 +94 @@
         }
 
-        sqe->delay = random() % (1000 * 1000);
+        sqe->delay = rand() % (1000 * 1000);
         sqe->epp = *epp;
         sqe->seg = seg;