[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[tyndur-devel] [PATCH 1/5] libc: labs(), llabs()



+ libc: long- und long-long-Varianten von abs()
* libc: abs() ist eigentlich der perfekte Kandidat fuer inline
---
 src/include/stdlib.h |   25 ++++++++++++++++++++++++-
 src/lib/misc.c       |   36 ------------------------------------
 2 files changed, 24 insertions(+), 37 deletions(-)
 delete mode 100644 src/lib/misc.c

diff --git a/src/include/stdlib.h b/src/include/stdlib.h
index 7327d60..97b70d4 100644
--- a/src/include/stdlib.h
+++ b/src/include/stdlib.h
@@ -74,7 +74,30 @@ char* mktemp(char* templatename);
 #ifndef CONFIG_LIBC_NO_STUBS
 double atof(const char* str);
 #endif
-int abs(int x);
+
+/**
+ * Absolutbetrag einer Zahl errechnen
+ */
+static inline int abs(int x)
+{
+    return (x < 0 ? -x : x);
+}
+
+/**
+ * Berechnet den Absolutwert eines long int
+ */
+static inline long int labs(long int x)
+{
+    return (x < 0 ? -x : x);
+}
+
+/**
+ * Berechnet den Absolutwert eines long long int
+ */
+static inline long long int llabs(long long int x)
+{
+    return (x < 0 ? -x : x);
+}
 
 int system(const char* command);
 
diff --git a/src/lib/misc.c b/src/lib/misc.c
deleted file mode 100644
index ec43765..0000000
--- a/src/lib/misc.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2007 The tyndur Project. All rights reserved.
- *
- * This code is derived from software contributed to the tyndur Project
- * by Antoine Kaufmann.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-#include <stdlib.h>
-
-/**
- * Absolutbetrag einer Zahl errechnen
- */
-int abs(int x)
-{
-    return (x < 0 ? -x : x);
-}
-- 
1.6.0.2