Prefer #pragma once

Author: jserv

config.h

@@ -3,8 +3,7 @@
  * @{
  */
 
-#ifndef CONFIG_H
-#define CONFIG_H
+#pragma once
 
 #define NSTACK_DATAGRAM_SIZE_MAX 4096
 
@@ -74,8 +73,6 @@
  * @}
  */
 
-#endif /* CONFIG_H */
-
 /**
  * @}
  */

include/linker_set.h

@@ -25,8 +25,7 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _SYS_LINKER_SET_H_
-#define _SYS_LINKER_SET_H_
+#pragma once
 
 #include "nstack_util.h"
 
@@ -80,5 +79,3 @@
  * Provide a count of the items in a set.
  */
 #define SET_COUNT(set) (SET_LIMIT(set) - SET_BEGIN(set))
-
-#endif /* _SYS_LINKER_SET_H_ */

include/nstack_in.h

@@ -1,5 +1,4 @@
-#ifndef NSTACK_IN_H
-#define NSTACK_IN_H
+#pragma once
 
 #include <arpa/inet.h> /* TODO Maybe we want to define our own version */
 #include <stdint.h>
@@ -23,5 +22,3 @@ static inline void ip2str(in_addr_t ip, char *buf)
     bytes[3] = (ip >> 24) & 0xFF;
     sprintf(buf, "%d.%d.%d.%d", bytes[3], bytes[2], bytes[1], bytes[0]);
 }
-
-#endif /* NSTACK_IN_H */

include/nstack_link.h

@@ -1,10 +1,7 @@
-#ifndef NSTACK_LINK_H
-#define NSTACK_LINK_H
+#pragma once
 
 #include <stdint.h>
 
 #define LINK_MAC_ALEN 6
 
 typedef uint8_t mac_addr_t[LINK_MAC_ALEN];
-
-#endif /* NSTACK_LINK_H */

include/nstack_socket.h

@@ -1,12 +1,11 @@
+#pragma once
+
 /**
  * nstack sockets.
  * @addtogroup Socket
  * @{
  */
 
-#ifndef NSTACK_SOCKET_H
-#define NSTACK_SOCKET_H
-
 #include <stdint.h>
 #include <sys/types.h>
 
@@ -111,8 +110,6 @@ ssize_t nstack_sendto(void *socket,
                       int flags,
                       const struct nstack_sockaddr *dest_addr);
 
-#endif /* NSTACK_SOCKET_H */
-
 /**
  * @}
  */

include/nstack_util.h

@@ -1,5 +1,4 @@
-#ifndef NSTACK_UTIL_H
-#define NSTACK_UTIL_H
+#pragma once
 
 #ifndef __GLOBL1
 #define __GLOBL1(sym) __asm__(".globl " #sym)
@@ -82,5 +81,3 @@ static inline unsigned int uround_up(unsigned n, unsigned s)
 {
     return ((n + s - 1) / s) * s;
 }
-
-#endif /* NSTACK_UTIL */

include/queue_r.h

@@ -8,8 +8,6 @@
  */
 
 #pragma once
-#ifndef QUEUE_R_H
-#define QUEUE_R_H
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -155,8 +153,6 @@ static inline bool queue_isfull(queue_cb_t *cb)
     return ((cb->m_write + 1) % cb->a_len) == cb->m_read;
 }
 
-#endif /* QUEUE_R_H */
-
 /**
  * @}
  */

src/collection.h

@@ -24,8 +24,7 @@
  * SUCH DAMAGE.
  */
 
-#ifndef _SYS_QUEUE_H_
-#define _SYS_QUEUE_H_
+#pragma once
 
 #include <err.h>
 
@@ -694,5 +693,3 @@ struct qm_trace {
         else                                                  \
             (head2)->tqh_last = &(head2)->tqh_first;          \
     } while (0)
-
-#endif /* !_SYS_QUEUE_H_ */

src/ip_defer.h

@@ -5,8 +5,7 @@
  * @{
  */
 
-#ifndef IP_DEFER_H
-#define IP_DEFER_H
+#pragma once
 
 #include "nstack_in.h"
 
@@ -17,8 +16,6 @@ int ip_defer_push(in_addr_t dst,
 
 void ip_defer_handler(int delta_time);
 
-#endif /* IP_DEFER_H */
-
 /**
  * @}
  */

src/logger.h

@@ -1,5 +1,4 @@
-#ifndef LOGGER_H
-#define LOGGER_H
+#pragma once
 
 #include <stdio.h>
 
@@ -17,5 +16,3 @@ enum log_level {
                 "\n",                              \
                 _level_, __func__, ##__VA_ARGS__); \
     } while (0)
-
-#endif /* LOGGER_H */

src/nstack_arp.h

@@ -3,8 +3,7 @@
  * @{
  */
 
-#ifndef NSTACK_ARP_H
-#define NSTACK_ARP_H
+#pragma once
 
 #include "nstack_in.h"
 #include "nstack_link.h"
@@ -71,8 +70,6 @@ int arp_cache_get_haddr(in_addr_t iface, in_addr_t ip_addr, mac_addr_t haddr);
  */
 int arp_gratuitous(int ether_handle, in_addr_t spa);
 
-#endif /* NSTACK_ARP_H */
-
 /**
  * @}
  */

src/nstack_ether.h

@@ -3,8 +3,7 @@
  * @{
  */
 
-#ifndef NSTACK_ETHER_H
-#define NSTACK_ETHER_H
+#pragma once
 
 #include <stddef.h>
 #include <stdint.h>
@@ -147,8 +146,6 @@ int ether_output_reply(int ether_handle,
  * @}
  */
 
-#endif /* NSTACK_ETHER_H */
-
 /**
  * @}
  */

src/nstack_icmp.h

@@ -3,8 +3,7 @@
  * @{
  */
 
-#ifndef NSTACK_ICMP_H
-#define NSTACK_ICMP_H
+#pragma once
 
 #include <stdint.h>
 
@@ -71,8 +70,6 @@ int icmp_generate_dest_unreachable(struct ip_hdr *hdr,
                                    uint8_t *buf,
                                    size_t bsize);
 
-#endif /* NSTACK_ICMP_H */
-
 /**
  * @}
  */

src/nstack_internal.h

@@ -1,5 +1,4 @@
-#ifndef NSTACK_INTERNAL_H
-#define NSTACK_INTERNAL_H
+#pragma once
 
 #include <stdatomic.h>
 #include <sys/time.h>
@@ -62,5 +61,3 @@ typedef int nstack_send_fn(struct nstack_sock *sock,
 /**
  * @}
  */
-
-#endif /* NSTACK_INTERNAL_H */

src/nstack_ip.h

@@ -4,8 +4,7 @@
  * @{
  */
 
-#ifndef NSTACK_IP_H
-#define NSTACK_IP_H
+#pragma once
 
 #include "linker_set.h"
 #include "nstack_ether.h"
@@ -215,8 +214,6 @@ int ip_fragment_input(struct ip_hdr *ip_hdr, uint8_t *rx_packet);
  * @}
  */
 
-#endif /* NSTACK_IP_H */
-
 /**
  * @}
  */

src/tcp.h

@@ -4,8 +4,7 @@
  * @{
  */
 
-#ifndef NSTACK_TCP_H
-#define NSTACK_TCP_H
+#pragma once
 
 #include <stdint.h>
 
@@ -86,8 +85,6 @@ struct nstack_sock *nstack_udp_alloc_sock(void);
 int nstack_tcp_bind(struct nstack_sock *sock);
 int nstack_tcp_send(struct nstack_sock *sock, const struct nstack_dgram *dgram);
 
-#endif /* NSTACK_UDP_H */
-
 /**
  * @}
  */

src/tree.h

@@ -23,8 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _SYS_TREE_H_
-#define _SYS_TREE_H_
+#pragma once
 
 #include "nstack_util.h"
 
@@ -753,5 +752,3 @@
 #define RB_FOREACH_REVERSE_SAFE(x, name, head, y) \
     for ((x) = RB_MAX(name, head);                \
          ((x) != NULL) && ((y) = name##_RB_PREV(x), (x) != NULL); (x) = (y))
-
-#endif /* _SYS_TREE_H_ */

src/udp.h

@@ -4,8 +4,7 @@
  * @{
  */
 
-#ifndef NSTACK_UDP_H
-#define NSTACK_UDP_H
+#pragma once
 
 #include <stdint.h>
 
@@ -36,8 +35,6 @@ struct nstack_dgram;
 int nstack_udp_bind(struct nstack_sock *sock);
 int nstack_udp_send(struct nstack_sock *sock, const struct nstack_dgram *dgram);
 
-#endif /* NSTACK_UDP_H */
-
 /**
  * @}
  */