Changeset 04803bf in mainline for uspace/app/netecho/print_error.h

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes (needs fixes).

File:

• uspace/app/netecho/print_error.h (moved) (moved from uspace/lib/libc/arch/ia64/include/atomic.h ) (2 diffs)

uspace/app/netecho/print_error.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2005 Jakub Jermar
+ * Copyright (c) 2009 Lukas Mejdrech
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libcia64        
+/** @addtogroup net_app
  * @{
  */
+
 /** @file
+ * Generic application error printing functions.
  */
 
-#ifndef LIBC_ia64_ATOMIC_H_
-#define LIBC_ia64_ATOMIC_H_
+#ifndef NET_APP_PRINT_
+#define NET_APP_PRINT_
 
-/** Atomic addition.
+#include <stdio.h>
+
+/** Returns whether the error code may be an ICMP error code.
  *
- * @param val Atomic value.
- * @param imm Value to add.
+ * @param[in] error_code The error code.
+ * @return A value indicating whether the error code may be an ICMP error code.
+ */
+#define IS_ICMP_ERROR(error_code)       ((error_code) > 0)
+
+/** Returns whether the error code may be socket error code.
  *
- * @return Value before addition.
+ * @param[in] error_code The error code.
+ * @return A value indicating whether the error code may be a socket error code.
  */
-static inline long atomic_add(atomic_t *val, int imm)
-{
-        long v;
+#define IS_SOCKET_ERROR(error_code)     ((error_code) < 0)
 
-        asm volatile ("fetchadd8.rel %0 = %1, %2\n" : "=r" (v), "+m" (val->count) : "i" (imm));
- 
-        return v;
-}
-
-static inline void atomic_inc(atomic_t *val) { atomic_add(val, 1); }
-static inline void atomic_dec(atomic_t *val) { atomic_add(val, -1); }
-
-static inline long atomic_preinc(atomic_t *val) { return atomic_add(val, 1) + 1; }
-static inline long atomic_predec(atomic_t *val) { return atomic_add(val, -1) - 1; }
-
-static inline long atomic_postinc(atomic_t *val) { return atomic_add(val, 1); }
-static inline long atomic_postdec(atomic_t *val) { return atomic_add(val, -1); }
+extern void icmp_print_error(FILE *, int, const char *, const char *);
+extern void print_error(FILE *, int, const char *, const char *);
+extern void socket_print_error(FILE *, int, const char *, const char *);
 
 #endif