Changeset 7d7bc09 in mainline

Timestamp:

2018-06-20T18:58:11Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

777832e

Parents:

3bd1d7d4

Message:

abs, labs, llabs.

Location:

uspace/lib

Files:

• c/generic/io/printf_core.c (modified) (1 diff)
• c/generic/stdlib.c (modified) (1 diff)
• c/generic/vfs/vfs.c (modified) (2 diffs)
• c/include/macros.h (modified) (1 diff)
• c/include/stdlib.h (modified) (1 diff)
• c/test/stdlib.c (modified) (1 diff)
• posix/include/posix/stdlib.h (modified) (1 diff)
• posix/src/stdlib.c (modified) (1 diff)
• posix/src/stdlib/strtold.c (modified) (1 diff)

uspace/lib/c/generic/io/printf_core.c

@@ -39 +39 @@
 #include <stdio.h>
 #include <stddef.h>
+#include <stdlib.h>
 #include <io/printf_core.h>
 #include <ctype.h>

uspace/lib/c/generic/stdlib.c

@@ -195 +195 @@
 }
 
+/** Compute the absolute value of an integer.
+ *
+ * If the result cannot be represented, the behavior is undefined.
+ *
+ * @param j Integer
+ * @return The absolute value of @a j
+ */
+int abs(int j)
+{
+        int aj;
+
+        if (j < 0) {
+                aj = -j;
+                assert(aj >= 0);
+        } else {
+                aj = j;
+        }
+
+        return aj;
+}
+
+/** Compute the absolute value of a long integer.
+ *
+ * If the result cannot be represented, the behavior is undefined.
+ *
+ * @param j Long integer
+ * @return The absolute value of @a j
+ */
+long labs(long j)
+{
+        long aj;
+
+        if (j < 0) {
+                aj = -j;
+                assert(aj >= 0);
+        } else {
+                aj = j;
+        }
+
+        return aj;
+}
+
+/** Compute the absolute value of a long long integer.
+ *
+ * If the result cannot be represented, the behavior is undefined.
+ *
+ * @param j Long long integer
+ * @return The absolute value of @a j
+ */
+long long llabs(long long j)
+{
+        long long aj;
+
+        if (j < 0) {
+                aj = -j;
+                assert(aj >= 0);
+        } else {
+                aj = j;
+        }
+
+        return aj;
+}
+
 /** Compute quotient and remainder of int division.
  *

uspace/lib/c/generic/vfs/vfs.c

@@ -285 +285 @@
 {
         size_t abs_size;
-        char *abs = vfs_absolutize(path, &abs_size);
-        if (!abs)
+        char *abs_path = vfs_absolutize(path, &abs_size);
+        if (abs_path == NULL)
                 return ENOMEM;
 
         int fd;
-        errno_t rc = vfs_lookup(abs, WALK_DIRECTORY, &fd);
+        errno_t rc = vfs_lookup(abs_path, WALK_DIRECTORY, &fd);
         if (rc != EOK) {
-                free(abs);
+                free(abs_path);
                 return rc;
         }
@@ -305 +305 @@
 
         cwd_fd = fd;
-        cwd_path = abs;
+        cwd_path = abs_path;
         cwd_size = abs_size;
 

uspace/lib/c/include/macros.h

@@ -38 +38 @@
 #define min(a, b)  ((a) < (b) ? (a) : (b))
 #define max(a, b)  ((a) > (b) ? (a) : (b))
-#define abs(a)     ((a) >= 0 ? (a) : -(a))
+#define mabs(a)    ((a) >= 0 ? (a) : -(a))
 
 #define ARRAY_SIZE(array)   (sizeof(array) / sizeof(array[0]))

uspace/lib/c/include/stdlib.h

@@ -87 +87 @@
 extern int system(const char *);
 
+extern int abs(int);
+extern long labs(long);
+extern long long llabs(long long);
+
 extern int atoi(const char *);
 extern long atol(const char *);

uspace/lib/c/test/stdlib.c

@@ -361 +361 @@
 }
 
+/** abs function of positive number */
+PCUT_TEST(abs_pos)
+{
+        int i;
+
+        i = abs(1);
+        PCUT_ASSERT_TRUE(i == 1);
+}
+
+/** abs function of negative number */
+PCUT_TEST(abs_neg)
+{
+        int i;
+
+        i = abs(-1);
+        PCUT_ASSERT_TRUE(i == 1);
+}
+
+/** labs function of positive number */
+PCUT_TEST(labs_pos)
+{
+        long li;
+
+        li = labs(1);
+        PCUT_ASSERT_TRUE(li == 1);
+}
+
+/** labs function of negative number */
+PCUT_TEST(labs_neg)
+{
+        long li;
+
+        li = labs(-1);
+        PCUT_ASSERT_TRUE(li == 1);
+}
+
+/** llabs function of positive number */
+PCUT_TEST(llabs_pos)
+{
+        long long lli;
+
+        lli = llabs(1);
+        PCUT_ASSERT_TRUE(lli == 1);
+}
+
+/** llabs function of negative number */
+PCUT_TEST(llabs_neg)
+{
+        long long lli;
+
+        lli = llabs(-1);
+        PCUT_ASSERT_TRUE(lli == 1);
+}
+
 /** Integer division */
 PCUT_TEST(div_func)

uspace/lib/posix/include/posix/stdlib.h

@@ -42 +42 @@
 #include <_bits/NULL.h>
 
-/* Absolute Value */
-extern int abs(int i);
-extern long labs(long i);
-extern long long llabs(long long i);
-
 /* Environment Access */
 extern int putenv(char *string);

uspace/lib/posix/src/stdlib.c

@@ -49 +49 @@
 #include "libc/vfs/vfs.h"
 #include "libc/stats.h"
-
-/**
- * Integer absolute value.
- *
- * @param i Input value.
- * @return Absolute value of the parameter.
- */
-int abs(int i)
-{
-        return i < 0 ? -i : i;
-}
-
-/**
- * Long integer absolute value.
- *
- * @param i Input value.
- * @return Absolute value of the parameter.
- */
-long labs(long i)
-{
-        return i < 0 ? -i : i;
-}
-
-/**
- * Long long integer absolute value.
- *
- * @param i Input value.
- * @return Absolute value of the parameter.
- */
-long long llabs(long long i)
-{
-        return i < 0 ? -i : i;
-}
 
 /**

uspace/lib/posix/src/stdlib/strtold.c

@@ -52 +52 @@
 #ifndef HUGE_VALL
 #define HUGE_VALL (+1.0l / +0.0l)
-#endif
-
-#ifndef abs
-#define abs(x) (((x) < 0) ? -(x) : (x))
 #endif