Changeset a1a101d in mainline for uspace/srv/net/ethip/pdu.c

Timestamp:

2012-08-17T16:58:51Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

bc0ccab

Parents:

920d0fc

Message:

Get rid of log_log_msg()

All calls to log_msg(LVL_*) were rewritten to
log_msg(LOG_DEFAULT, LVL_*).

File:

• uspace/srv/net/ethip/pdu.c (modified) (11 diffs)

uspace/srv/net/ethip/pdu.c

@@ -69 +69 @@
             frame->size);
 
-        log_msg(LVL_DEBUG, "Encoding Ethernet frame src=%llx dest=%llx etype=%x",
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "Encoding Ethernet frame src=%llx dest=%llx etype=%x",
             frame->src, frame->dest, frame->etype_len);
-        log_msg(LVL_DEBUG, "Encoded Ethernet frame (%zu bytes)", size);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "Encoded Ethernet frame (%zu bytes)", size);
 
         *rdata = data;
@@ -83 +83 @@
         eth_header_t *hdr;
 
-        log_msg(LVL_DEBUG, "eth_pdu_decode()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "eth_pdu_decode()");
 
         if (size < sizeof(eth_header_t)) {
-                log_msg(LVL_DEBUG, "PDU too short (%zu)", size);
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "PDU too short (%zu)", size);
                 return EINVAL;
         }
@@ -104 +104 @@
             frame->size);
 
-        log_msg(LVL_DEBUG, "Decoding Ethernet frame src=%llx dest=%llx etype=%x",
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "Decoding Ethernet frame src=%llx dest=%llx etype=%x",
             frame->src, frame->dest, frame->etype_len);
-        log_msg(LVL_DEBUG, "Decoded Ethernet frame payload (%zu bytes)", frame->size);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "Decoded Ethernet frame payload (%zu bytes)", frame->size);
 
         return EOK;
@@ -143 +143 @@
         uint16_t fopcode;
 
-        log_msg(LVL_DEBUG, "arp_pdu_encode()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "arp_pdu_encode()");
 
         size = sizeof(arp_eth_packet_fmt_t);
@@ -183 +183 @@
         arp_eth_packet_fmt_t *pfmt;
 
-        log_msg(LVL_DEBUG, "arp_pdu_decode()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "arp_pdu_decode()");
 
         if (size < sizeof(arp_eth_packet_fmt_t)) {
-                log_msg(LVL_DEBUG, "ARP PDU too short (%zu)", size);
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "ARP PDU too short (%zu)", size);
                 return EINVAL;
         }
@@ -193 +193 @@
 
         if (uint16_t_be2host(pfmt->hw_addr_space) != AHRD_ETHERNET) {
-                log_msg(LVL_DEBUG, "HW address space != %u (%" PRIu16 ")",
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "HW address space != %u (%" PRIu16 ")",
                     AHRD_ETHERNET, uint16_t_be2host(pfmt->hw_addr_space));
                 return EINVAL;
@@ -199 +199 @@
 
         if (uint16_t_be2host(pfmt->proto_addr_space) != 0x0800) {
-                log_msg(LVL_DEBUG, "Proto address space != %u (%" PRIu16 ")",
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Proto address space != %u (%" PRIu16 ")",
                     ETYPE_IP, uint16_t_be2host(pfmt->proto_addr_space));
                 return EINVAL;
@@ -205 +205 @@
 
         if (pfmt->hw_addr_size != ETH_ADDR_SIZE) {
-                log_msg(LVL_DEBUG, "HW address size != %zu (%zu)",
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "HW address size != %zu (%zu)",
                     (size_t)ETH_ADDR_SIZE, (size_t)pfmt->hw_addr_size);
                 return EINVAL;
@@ -211 +211 @@
 
         if (pfmt->proto_addr_size != IPV4_ADDR_SIZE) {
-                log_msg(LVL_DEBUG, "Proto address size != %zu (%zu)",
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Proto address size != %zu (%zu)",
                     (size_t)IPV4_ADDR_SIZE, (size_t)pfmt->proto_addr_size);
                 return EINVAL;
@@ -220 +220 @@
         case AOP_REPLY: packet->opcode = aop_reply; break;
         default:
-                log_msg(LVL_DEBUG, "Invalid ARP opcode (%" PRIu16 ")",
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Invalid ARP opcode (%" PRIu16 ")",
                     uint16_t_be2host(pfmt->opcode));
                 return EINVAL;
@@ -231 +231 @@
         packet->target_proto_addr.ipv4 =
             uint32_t_be2host(pfmt->target_proto_addr);
-        log_msg(LVL_DEBUG, "packet->tpa = %x\n", pfmt->target_proto_addr);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "packet->tpa = %x\n", pfmt->target_proto_addr);
 
         return EOK;