Changeset c6588ce in mainline for uspace/app/netecho/print_error.c

Timestamp:

2012-05-05T08:12:17Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ee04c28

Parents:

2cc7f16 (diff), d21e935c (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/app/netecho/print_error.c (modified) (2 diffs)

uspace/app/netecho/print_error.c

@@ -40 +40 @@
 #include <errno.h>
 
-#include <net/icmp_codes.h>
-
-/** 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)
-{
-        if (!output)
-                return;
-        
-        if (prefix)
-                fprintf(output, "%s", prefix);
-                
-        switch (error_code) {
-        case ICMP_DEST_UNREACH:
-                fprintf(output, "ICMP Destination Unreachable (%d) error", error_code);
-                break;
-        case ICMP_SOURCE_QUENCH:
-                fprintf(output, "ICMP Source Quench (%d) error", error_code);
-                break;
-        case ICMP_REDIRECT:
-                fprintf(output, "ICMP Redirect (%d) error", error_code);
-                break;
-        case ICMP_ALTERNATE_ADDR:
-                fprintf(output, "ICMP Alternate Host Address (%d) error", error_code);
-                break;
-        case ICMP_ROUTER_ADV:
-                fprintf(output, "ICMP Router Advertisement (%d) error", error_code);
-                break;
-        case ICMP_ROUTER_SOL:
-                fprintf(output, "ICMP Router Solicitation (%d) error", error_code);
-                break;
-        case ICMP_TIME_EXCEEDED:
-                fprintf(output, "ICMP Time Exceeded (%d) error", error_code);
-                break;
-        case ICMP_PARAMETERPROB:
-                fprintf(output, "ICMP Paramenter Problem (%d) error", error_code);
-                break;
-        case ICMP_CONVERSION_ERROR:
-                fprintf(output, "ICMP Datagram Conversion Error (%d) error", error_code);
-                break;
-        case ICMP_REDIRECT_MOBILE:
-                fprintf(output, "ICMP Mobile Host Redirect (%d) error", error_code);
-                break;
-        case ICMP_SKIP:
-                fprintf(output, "ICMP SKIP (%d) error", error_code);
-                break;
-        case ICMP_PHOTURIS:
-                fprintf(output, "ICMP Photuris (%d) error", error_code);
-                break;
-        default:
-                fprintf(output, "Other (%d) error", error_code);
-        }
-
-        if (suffix)
-                fprintf(output, "%s", suffix);
-}
-
 /** Prints the error description.
  *
- * Supports ICMP and socket error codes.
+ * Supports socket error codes.
  *
  * @param[in] output The description output stream. May be NULL.
@@ -113 +51 @@
 void print_error(FILE *output, int error_code, const char *prefix, const char *suffix)
 {
-        if (IS_ICMP_ERROR(error_code))
-                icmp_print_error(output, error_code, prefix, suffix);
-        else if(IS_SOCKET_ERROR(error_code))
+        if(IS_SOCKET_ERROR(error_code))
                 socket_print_error(output, error_code, prefix, suffix);
 }