Minor changes (tabs, ident, coding style...)

diff --git a/src/api/api_msg.c b/src/api/api_msg.c
index 1a112789c4c3246795df86ad9c1e629c8f6b1dbb..8c9c24b005f4afff35302cb615c5eb63397ba1d0 100644 (file)
--- a/src/api/api_msg.c
+++ b/src/api/api_msg.c
@@ -71,7 +71,7 @@ recv_raw(void *arg, struct raw_pcb *pcb, struct pbuf *p,
 
   if ((conn != NULL) && (conn->recvmbox != SYS_MBOX_NULL)) {
     buf = memp_malloc(MEMP_NETBUF);
-    if (!buf) {
+    if (buf == NULL) {
       return 0;
     }
     pbuf_ref(p);

diff --git a/src/api/tcpip.c b/src/api/tcpip.c
index 87a31fad1961b2cd1f54f862de6a911255f0b30a..b71fb96d7672b8232dc62d4f2f42beabb48a198f 100644 (file)
--- a/src/api/tcpip.c
+++ b/src/api/tcpip.c
@@ -245,14 +245,14 @@ ethernet_input(struct pbuf *p, struct netif *netif)
       etharp_arp_input(netif, (struct eth_addr*)(netif->hwaddr), p);
       break;
 
-#if PPPOE_SUPPORT > 0
-       case ETHTYPE_PPPOEDISC: /* PPP Over Ethernet Discovery Stage */
-         pppoe_disc_input(netif, p);
-         break;
-       case ETHTYPE_PPPOE: /* PPP Over Ethernet Session Stage */
-         pppoe_data_input(netif, p);
-         break;
-#endif
+#if PPPOE_SUPPORT
+    case ETHTYPE_PPPOEDISC: /* PPP Over Ethernet Discovery Stage */
+      pppoe_disc_input(netif, p);
+      break;
+    case ETHTYPE_PPPOE: /* PPP Over Ethernet Session Stage */
+      pppoe_data_input(netif, p);
+      break;
+#endif /* PPPOE_SUPPORT */
 
     default:
       pbuf_free(p);

diff --git a/src/core/mem.c b/src/core/mem.c
index b0885267384d4529658813ef69578f26d403a9e9..407d1a8770a47929499510426c576a1a5195d56c 100644 (file)
--- a/src/core/mem.c
+++ b/src/core/mem.c
@@ -503,12 +503,12 @@ mem_malloc(mem_size_t size)
 
 void *mem_calloc(size_t count, size_t size)
 {
-    void *p;
+  void *p;
 
-    p = mem_malloc(count * size);
-    if(p) {
-        memset(p, 0, count * size);
-    }
-    return p;
+  p = mem_malloc(count * size);
+  if(p) {
+    memset(p, 0, count * size);
+  }
+  return p;
 }
 #endif /* !MEM_LIBC_MALLOC */

diff --git a/src/core/tcp_in.c b/src/core/tcp_in.c
index 9aae63ba69c46b7ed47ef6fae05468026acc1ae3..383835090628a705d41ab63478389f81d5de2a50 100644 (file)
--- a/src/core/tcp_in.c
+++ b/src/core/tcp_in.c
@@ -301,8 +301,9 @@ tcp_input(struct pbuf *p, struct netif *inp)
         }
       
         if (recv_data != NULL) {
-          if(flags & TCP_PSH)
-                       recv_data->flgs |= PBUF_FLAG_PUSH;
+          if(flags & TCP_PSH) {
+            recv_data->flgs |= PBUF_FLAG_PUSH;
+          }
           /* Notify application that data has been received. */
           TCP_EVENT_RECV(pcb, recv_data, ERR_OK, err);
         }

diff --git a/src/include/lwip/mem.h b/src/include/lwip/mem.h
index f80e3b97aedf22e9ffc0996592fa24f005a40f0e..36c8781bd8018bd221e46390b9b1353c9f4ada20 100644 (file)
--- a/src/include/lwip/mem.h
+++ b/src/include/lwip/mem.h
@@ -83,8 +83,8 @@ void  mem_init(void);
 void *mem_realloc(void *mem, mem_size_t size);
 #endif /* MEM_USE_POOLS */
 void *mem_malloc(mem_size_t size);
-void  mem_free(void *mem);
 void *mem_calloc(size_t count, size_t size);
+void  mem_free(void *mem);
 #endif /* MEM_LIBC_MALLOC */
 
 #ifndef LWIP_MEM_ALIGN_SIZE

diff --git a/src/include/netif/etharp.h b/src/include/netif/etharp.h
index 52a3e8b99d796357aa765f9a713283ed37c6b20a..6b763c4c34d75cd07036d7512a2c765d03279801 100644 (file)
--- a/src/include/netif/etharp.h
+++ b/src/include/netif/etharp.h
@@ -119,8 +119,8 @@ PACK_STRUCT_END
 /** 5 seconds period */
 #define ARP_TMR_INTERVAL 5000
 
-#define ETHTYPE_ARP 0x0806
-#define ETHTYPE_IP  0x0800
+#define ETHTYPE_ARP       0x0806
+#define ETHTYPE_IP        0x0800
 #define ETHTYPE_PPPOEDISC 0x8863  /* PPP Over Ethernet Discovery Stage */
 #define ETHTYPE_PPPOE     0x8864  /* PPP Over Ethernet Session Stage */
 

diff --git a/src/netif/ethernetif.c b/src/netif/ethernetif.c
index db45767ea9a4d236c74853b6c100076912b4ad38..d6cdbd22016740c6e807c3c01ba4560568783c58 100644 (file)
--- a/src/netif/ethernetif.c
+++ b/src/netif/ethernetif.c
@@ -288,14 +288,14 @@ ethernetif_input(struct netif *netif)
 #endif /* ETHARP_TCPIP_INPUT */
 #endif /* ETHARP_TCPIP_ETHINPUT */
 
-#if PPPOE_SUPPORT > 0
+#if PPPOE_SUPPORT
   case ETHTYPE_PPPOEDISC: /* PPP Over Ethernet Discovery Stage */
-       pppoe_disc_input(netif, p);
-       break;
+    pppoe_disc_input(netif, p);
+    break;
   case ETHTYPE_PPPOE: /* PPP Over Ethernet Session Stage */
-       pppoe_data_input(netif, p);
-       break;
-#endif
+    pppoe_data_input(netif, p);
+    break;
+#endif /* PPPOE_SUPPORT */
 
   default:
     pbuf_free(p);