Changeset 7715994 in mainline for uspace/srv/net/app/print_error.h

Timestamp:

2010-03-13T12:17:02Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6ba20a6b

Parents:

d0febca (diff), 2070570 (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.

File:

• uspace/srv/net/app/print_error.h (modified) (4 diffs)

uspace/srv/net/app/print_error.h

@@ -42 +42 @@
  *  @returns A value indicating whether the error code may be an ICMP error code.
  */
-#define IS_ICMP_ERROR( error_code )             (( error_code ) > 0 )
+#define IS_ICMP_ERROR(error_code)               ((error_code) > 0)
 
 /** Returns whether the error code may be socket error code.
@@ -48 +48 @@
  *  @returns A value indicating whether the error code may be a socket error code.
  */
-#define IS_SOCKET_ERROR( error_code )   (( error_code ) < 0 )
+#define IS_SOCKET_ERROR(error_code)     ((error_code) < 0)
+
+/** Prints the specific ICMP error description.
+ *  @param[in] output The description output stream. May be NULL.
+ *  @param[in] error_code The ICMP error code.
+ *  @param[in] prefix The error description prefix. May be NULL.
+ *  @param[in] suffix The error description suffix. May be NULL.
+ */
+void icmp_print_error(FILE * output, int error_code, const char * prefix, const char * suffix);
 
 /** Prints the error description.
@@ -57 +65 @@
  *  @param[in] suffix The error description suffix. May be NULL.
  */
-void print_error( FILE * output, int error_code, const char * prefix, const char * suffix );
-
-/** Prints the specific ICMP error description.
- *  @param[in] output The description output stream. May be NULL.
- *  @param[in] error_code The ICMP error code.
- *  @param[in] prefix The error description prefix. May be NULL.
- *  @param[in] suffix The error description suffix. May be NULL.
- */
-void icmp_print_error( FILE * output, int error_code, const char * prefix, const char * suffix );
+void print_error(FILE * output, int error_code, const char * prefix, const char * suffix);
 
 /** Prints the specific socket error description.
@@ -73 +73 @@
  *  @param[in] suffix The error description suffix. May be NULL.
  */
-void socket_print_error( FILE * output, int error_code, const char * prefix, const char * suffix );
+void socket_print_error(FILE * output, int error_code, const char * prefix, const char * suffix);
 
 #endif