From d4b6471d390c6ee2a2a4abdff7f1ddafabe1097d Mon Sep 17 00:00:00 2001 From: christiaans Date: Fri, 17 Nov 2006 10:51:13 +0000 Subject: [PATCH] Replaced tabs with space. --- src/core/dhcp.c | 24 ++++++++++++------------ src/core/inet.c | 28 ++++++++++++++-------------- src/core/ipv4/icmp.c | 6 +++--- src/core/memp.c | 4 ++-- src/core/stats.c | 4 ++-- src/core/udp.c | 4 ++-- src/include/ipv4/lwip/ip.h | 24 ++++++++++++------------ src/include/lwip/arch.h | 38 +++++++++++++++++++------------------- src/include/lwip/tcp.h | 6 +++--- src/netif/etharp.c | 10 +++++----- 10 files changed, 74 insertions(+), 74 deletions(-) diff --git a/src/core/dhcp.c b/src/core/dhcp.c index 34ed48fd..b5d46eef 100644 --- a/src/core/dhcp.c +++ b/src/core/dhcp.c @@ -495,7 +495,7 @@ static void dhcp_handle_ack(struct netif *netif) dhcp->dns_count = dhcp_get_option_byte(&option_ptr[1]) / (u32_t)sizeof(struct ip_addr); /* limit to at most DHCP_MAX_DNS DNS servers */ if (dhcp->dns_count > DHCP_MAX_DNS) - dhcp->dns_count = DHCP_MAX_DNS; + dhcp->dns_count = DHCP_MAX_DNS; for (n = 0; n < dhcp->dns_count; n++) { dhcp->offered_dns_addr[n].addr = htonl(dhcp_get_option_long(&option_ptr[2 + n * 4])); } @@ -539,18 +539,18 @@ err_t dhcp_start(struct netif *netif) } else { LWIP_DEBUGF(DHCP_DEBUG | DBG_TRACE | DBG_STATE | 3, ("dhcp_start(): restarting DHCP configuration\n")); } - - /* clear data structure */ - memset(dhcp, 0, sizeof(struct dhcp)); + + /* clear data structure */ + memset(dhcp, 0, sizeof(struct dhcp)); /* allocate UDP PCB */ - dhcp->pcb = udp_new(); - if (dhcp->pcb == NULL) { - LWIP_DEBUGF(DHCP_DEBUG | DBG_TRACE, ("dhcp_start(): could not obtain pcb\n")); - mem_free((void *)dhcp); - netif->dhcp = dhcp = NULL; - return ERR_MEM; - } - LWIP_DEBUGF(DHCP_DEBUG | DBG_TRACE, ("dhcp_start(): starting DHCP configuration\n")); + dhcp->pcb = udp_new(); + if (dhcp->pcb == NULL) { + LWIP_DEBUGF(DHCP_DEBUG | DBG_TRACE, ("dhcp_start(): could not obtain pcb\n")); + mem_free((void *)dhcp); + netif->dhcp = dhcp = NULL; + return ERR_MEM; + } + LWIP_DEBUGF(DHCP_DEBUG | DBG_TRACE, ("dhcp_start(): starting DHCP configuration\n")); /* (re)start the DHCP negotiation */ result = dhcp_discover(netif); if (result != ERR_OK) { diff --git a/src/core/inet.c b/src/core/inet.c index aa313680..2c54389e 100644 --- a/src/core/inet.c +++ b/src/core/inet.c @@ -58,7 +58,7 @@ #ifndef LWIP_CHKSUM #define LWIP_CHKSUM lwip_standard_chksum -#if 1 /* Version A */ +#if 1 /* Version A */ /** * lwip checksum * @@ -109,7 +109,7 @@ lwip_standard_chksum(void *dataptr, u16_t len) } #endif -#if 0 /* Version B */ +#if 0 /* Version B */ /* * Curt McDowell * Broadcom Corp. @@ -161,7 +161,7 @@ lwip_standard_chksum(void *dataptr, int len) } #endif -#if 0 /* Version C */ +#if 0 /* Version C */ /** * An optimized checksum routine. Basically, it uses loop-unrolling on * the checksum loop, treating the head and tail bytes specially, whereas @@ -339,8 +339,8 @@ inet_chksum_pbuf(struct pbuf *p) #define isxdigit(c) (isdigit(c) || in_range(c, 'a', 'f') || in_range(c, 'A', 'F')) #define islower(c) in_range(c, 'a', 'z') #define isspace(c) (c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v') -#endif - +#endif + /* * Ascii internet address interpretation routine. * The value returned is in network order. @@ -386,20 +386,20 @@ inet_aton(const char *cp, struct in_addr *addr) if (c == '0') { c = *++cp; if (c == 'x' || c == 'X') { - base = 16; - c = *++cp; + base = 16; + c = *++cp; } else - base = 8; + base = 8; } for (;;) { if (isdigit(c)) { - val = (val * base) + (int)(c - '0'); - c = *++cp; + val = (val * base) + (int)(c - '0'); + c = *++cp; } else if (base == 16 && isxdigit(c)) { - val = (val << 4) | (int)(c + 10 - (islower(c) ? 'a' : 'A')); - c = *++cp; + val = (val << 4) | (int)(c + 10 - (islower(c) ? 'a' : 'A')); + c = *++cp; } else - break; + break; } if (c == '.') { /* @@ -409,7 +409,7 @@ inet_aton(const char *cp, struct in_addr *addr) * a.b (with b treated as 24 bits) */ if (pp >= parts + 3) - return (0); + return (0); *pp++ = val; c = *++cp; } else diff --git a/src/core/ipv4/icmp.c b/src/core/ipv4/icmp.c index db820148..248f2c6b 100644 --- a/src/core/ipv4/icmp.c +++ b/src/core/ipv4/icmp.c @@ -113,7 +113,7 @@ icmp_input(struct pbuf *p, struct netif *inp) pbuf_header(p, hlen); ip_output_if(p, &(iphdr->src), IP_HDRINCL, - IPH_TTL(iphdr), 0, IP_PROTO_ICMP, inp); + IPH_TTL(iphdr), 0, IP_PROTO_ICMP, inp); break; default: LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: ICMP type %"S16_F" code %"S16_F" not supported.\n", (s16_t)type, (s16_t)code)); @@ -151,7 +151,7 @@ icmp_dest_unreach(struct pbuf *p, enum icmp_dur_type t) snmp_inc_icmpoutdestunreachs(); ip_output(q, NULL, &(iphdr->src), - ICMP_TTL, 0, IP_PROTO_ICMP); + ICMP_TTL, 0, IP_PROTO_ICMP); pbuf_free(q); } @@ -188,7 +188,7 @@ icmp_time_exceeded(struct pbuf *p, enum icmp_te_type t) /* increase number of destination unreachable messages attempted to send */ snmp_inc_icmpouttimeexcds(); ip_output(q, NULL, &(iphdr->src), - ICMP_TTL, 0, IP_PROTO_ICMP); + ICMP_TTL, 0, IP_PROTO_ICMP); pbuf_free(q); } diff --git a/src/core/memp.c b/src/core/memp.c index ba9f796a..b31812d7 100644 --- a/src/core/memp.c +++ b/src/core/memp.c @@ -112,8 +112,8 @@ memp_sanity(void) for (m = memp_tab[i]; m != NULL; m = m->next) { c = 1; for (n = memp_tab[i]; n != NULL; n = n->next) { - if (n == m && --c < 0) { - return 0; /* LW was: abort(); */ + if (n == m && --c < 0) { + return 0; /* LW was: abort(); */ } } } diff --git a/src/core/stats.c b/src/core/stats.c index 50f6fe5a..d5b37406 100644 --- a/src/core/stats.c +++ b/src/core/stats.c @@ -96,7 +96,7 @@ stats_display(void) { s16_t i; char * memp_names[] = {"PBUF", "RAW_PCB", "UDP_PCB", "TCP_PCB", "TCP_PCB_LISTEN", - "TCP_SEG", "NETBUF", "NETCONN", "API_MSG", "TCP_MSG", "TIMEOUT"}; + "TCP_SEG", "NETBUF", "NETCONN", "API_MSG", "TCP_MSG", "TIMEOUT"}; stats_display_proto(&lwip_stats.link, "LINK"); stats_display_proto(&lwip_stats.ip_frag, "IP_FRAG"); stats_display_proto(&lwip_stats.ip, "IP"); @@ -108,7 +108,7 @@ stats_display(void) for (i = 0; i < MEMP_MAX; i++) { stats_display_mem(&lwip_stats.memp[i], memp_names[i]); } - + } #endif /* LWIP_STATS_DISPLAY */ #endif /* LWIP_STATS */ diff --git a/src/core/udp.c b/src/core/udp.c index 82998d40..fb156856 100644 --- a/src/core/udp.c +++ b/src/core/udp.c @@ -614,8 +614,8 @@ udp_remove(struct udp_pcb *pcb) for (pcb2 = udp_pcbs; pcb2 != NULL; pcb2 = pcb2->next) { /* find pcb in udp_pcbs list */ if (pcb2->next != NULL && pcb2->next == pcb) { - /* remove pcb from list */ - pcb2->next = pcb->next; + /* remove pcb from list */ + pcb2->next = pcb->next; } } memp_free(MEMP_UDP_PCB, pcb); diff --git a/src/include/ipv4/lwip/ip.h b/src/include/ipv4/lwip/ip.h index 796b1880..9f745f5d 100644 --- a/src/include/ipv4/lwip/ip.h +++ b/src/include/ipv4/lwip/ip.h @@ -45,9 +45,9 @@ void ip_init(void); struct netif *ip_route(struct ip_addr *dest); err_t ip_input(struct pbuf *p, struct netif *inp); err_t ip_output(struct pbuf *p, struct ip_addr *src, struct ip_addr *dest, - u8_t ttl, u8_t tos, u8_t proto); + u8_t ttl, u8_t tos, u8_t proto); err_t ip_output_if(struct pbuf *p, struct ip_addr *src, struct ip_addr *dest, - u8_t ttl, u8_t tos, u8_t proto, + u8_t ttl, u8_t tos, u8_t proto, struct netif *netif); #define IP_HLEN 20 @@ -82,16 +82,16 @@ err_t ip_output_if(struct pbuf *p, struct ip_addr *src, struct ip_addr *dest, /* * Option flags per-socket. These are the same like SO_XXX. */ -#define SOF_DEBUG (u16_t)0x0001U /* turn on debugging info recording */ -#define SOF_ACCEPTCONN (u16_t)0x0002U /* socket has had listen() */ -#define SOF_REUSEADDR (u16_t)0x0004U /* allow local address reuse */ -#define SOF_KEEPALIVE (u16_t)0x0008U /* keep connections alive */ -#define SOF_DONTROUTE (u16_t)0x0010U /* just use interface addresses */ -#define SOF_BROADCAST (u16_t)0x0020U /* permit sending of broadcast msgs */ -#define SOF_USELOOPBACK (u16_t)0x0040U /* bypass hardware when possible */ -#define SOF_LINGER (u16_t)0x0080U /* linger on close if data present */ -#define SOF_OOBINLINE (u16_t)0x0100U /* leave received OOB data in line */ -#define SOF_REUSEPORT (u16_t)0x0200U /* allow local address & port reuse */ +#define SOF_DEBUG (u16_t)0x0001U /* turn on debugging info recording */ +#define SOF_ACCEPTCONN (u16_t)0x0002U /* socket has had listen() */ +#define SOF_REUSEADDR (u16_t)0x0004U /* allow local address reuse */ +#define SOF_KEEPALIVE (u16_t)0x0008U /* keep connections alive */ +#define SOF_DONTROUTE (u16_t)0x0010U /* just use interface addresses */ +#define SOF_BROADCAST (u16_t)0x0020U /* permit sending of broadcast msgs */ +#define SOF_USELOOPBACK (u16_t)0x0040U /* bypass hardware when possible */ +#define SOF_LINGER (u16_t)0x0080U /* linger on close if data present */ +#define SOF_OOBINLINE (u16_t)0x0100U /* leave received OOB data in line */ +#define SOF_REUSEPORT (u16_t)0x0200U /* allow local address & port reuse */ diff --git a/src/include/lwip/arch.h b/src/include/lwip/arch.h index e0d622a4..3713bba4 100644 --- a/src/include/lwip/arch.h +++ b/src/include/lwip/arch.h @@ -187,25 +187,25 @@ #define EMEDIUMTYPE 124 /* Wrong medium type */ -#define ENSROK 0 /* DNS server returned answer with no data */ -#define ENSRNODATA 160 /* DNS server returned answer with no data */ -#define ENSRFORMERR 161 /* DNS server claims query was misformatted */ -#define ENSRSERVFAIL 162 /* DNS server returned general failure */ -#define ENSRNOTFOUND 163 /* Domain name not found */ -#define ENSRNOTIMP 164 /* DNS server does not implement requested operation */ -#define ENSRREFUSED 165 /* DNS server refused query */ -#define ENSRBADQUERY 166 /* Misformatted DNS query */ -#define ENSRBADNAME 167 /* Misformatted domain name */ -#define ENSRBADFAMILY 168 /* Unsupported address family */ -#define ENSRBADRESP 169 /* Misformatted DNS reply */ -#define ENSRCONNREFUSED 170 /* Could not contact DNS servers */ -#define ENSRTIMEOUT 171 /* Timeout while contacting DNS servers */ -#define ENSROF 172 /* End of file */ -#define ENSRFILE 173 /* Error reading file */ -#define ENSRNOMEM 174 /* Out of memory */ -#define ENSRDESTRUCTION 175 /* Application terminated lookup */ -#define ENSRQUERYDOMAINTOOLONG 176 /* Domain name is too long */ -#define ENSRCNAMELOOP 177 /* Domain name is too long */ +#define ENSROK 0 /* DNS server returned answer with no data */ +#define ENSRNODATA 160 /* DNS server returned answer with no data */ +#define ENSRFORMERR 161 /* DNS server claims query was misformatted */ +#define ENSRSERVFAIL 162 /* DNS server returned general failure */ +#define ENSRNOTFOUND 163 /* Domain name not found */ +#define ENSRNOTIMP 164 /* DNS server does not implement requested operation */ +#define ENSRREFUSED 165 /* DNS server refused query */ +#define ENSRBADQUERY 166 /* Misformatted DNS query */ +#define ENSRBADNAME 167 /* Misformatted domain name */ +#define ENSRBADFAMILY 168 /* Unsupported address family */ +#define ENSRBADRESP 169 /* Misformatted DNS reply */ +#define ENSRCONNREFUSED 170 /* Could not contact DNS servers */ +#define ENSRTIMEOUT 171 /* Timeout while contacting DNS servers */ +#define ENSROF 172 /* End of file */ +#define ENSRFILE 173 /* Error reading file */ +#define ENSRNOMEM 174 /* Out of memory */ +#define ENSRDESTRUCTION 175 /* Application terminated lookup */ +#define ENSRQUERYDOMAINTOOLONG 176 /* Domain name is too long */ +#define ENSRCNAMELOOP 177 /* Domain name is too long */ #ifndef errno extern int errno; diff --git a/src/include/lwip/tcp.h b/src/include/lwip/tcp.h index 6f056ce5..9f868922 100644 --- a/src/include/lwip/tcp.h +++ b/src/include/lwip/tcp.h @@ -157,7 +157,7 @@ void tcp_rexmit_rto (struct tcp_pcb *pcb); /* * User-settable options (used with setsockopt). */ -#define TCP_NODELAY 0x01 /* don't delay send to coalesce packets */ +#define TCP_NODELAY 0x01 /* don't delay send to coalesce packets */ #define TCP_KEEPALIVE 0x02 /* send KEEPALIVE probes when idle for pcb->keepalive miliseconds */ /* Keepalive values */ @@ -456,8 +456,8 @@ void tcp_timer_needed(void); /* The TCP PCB lists. */ union tcp_listen_pcbs_t { /* List of all TCP PCBs in LISTEN state. */ - struct tcp_pcb_listen *listen_pcbs; - struct tcp_pcb *pcbs; + struct tcp_pcb_listen *listen_pcbs; + struct tcp_pcb *pcbs; }; extern union tcp_listen_pcbs_t tcp_listen_pcbs; extern struct tcp_pcb *tcp_active_pcbs; /* List of all TCP PCBs that are in a diff --git a/src/netif/etharp.c b/src/netif/etharp.c index 526792cc..9787f6d8 100644 --- a/src/netif/etharp.c +++ b/src/netif/etharp.c @@ -280,7 +280,7 @@ static s8_t find_entry(struct ip_addr *ipaddr, u8_t flags) /* no empty entry found and not allowed to recycle? */ if ((empty == ARP_TABLE_SIZE) && ((flags & ETHARP_TRY_HARD) == 0)) { - return (s8_t)ERR_MEM; + return (s8_t)ERR_MEM; } /* b) choose the least destructive entry to recycle: @@ -815,12 +815,12 @@ err_t etharp_query(struct netif *netif, struct ip_addr *ipaddr, struct pbuf *q) if (p != NULL) { /* queue packet ... */ if (arp_table[i].p == NULL) { - /* ... in the empty queue */ - pbuf_ref(p); - arp_table[i].p = p; + /* ... in the empty queue */ + pbuf_ref(p); + arp_table[i].p = p; #if 0 /* multi-packet-queueing disabled, see bug #11400 */ } else { - /* ... at tail of non-empty queue */ + /* ... at tail of non-empty queue */ pbuf_queue(arp_table[i].p, p); #endif }