summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Munaut <tnt@246tNt.com>2014-06-16 10:13:40 +0200
committerSylvain Munaut <tnt@246tNt.com>2014-06-16 10:17:27 +0200
commit12ba778afdb797575e05284decd34cf2c27e3647 (patch)
tree8e98b7859c8866d706af877cd9edac3e1db5a09f
parentb0a3c2f1de73cb3acd70f7c93be8fc7e8925f31e (diff)
include: Switch to #pragma once pattern
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
-rw-r--r--include/osmocom/codec/codec.h5
-rw-r--r--include/osmocom/core/application.h5
-rw-r--r--include/osmocom/core/backtrace.h5
-rw-r--r--include/osmocom/core/bits.h5
-rw-r--r--include/osmocom/core/bitvec.h5
-rw-r--r--include/osmocom/core/conv.h5
-rw-r--r--include/osmocom/core/crc16.h5
-rw-r--r--include/osmocom/core/crcXXgen.h.tpl5
-rw-r--r--include/osmocom/core/crcgen.h5
-rw-r--r--include/osmocom/core/defs.h5
-rw-r--r--include/osmocom/core/gsmtap.h5
-rw-r--r--include/osmocom/core/gsmtap_util.h5
-rw-r--r--include/osmocom/core/linuxlist.h6
-rw-r--r--include/osmocom/core/linuxrbtree.h5
-rw-r--r--include/osmocom/core/logging.h5
-rw-r--r--include/osmocom/core/loggingrb.h5
-rw-r--r--include/osmocom/core/msgb.h5
-rw-r--r--include/osmocom/core/msgfile.h5
-rw-r--r--include/osmocom/core/panic.h5
-rw-r--r--include/osmocom/core/plugin.h5
-rw-r--r--include/osmocom/core/prim.h5
-rw-r--r--include/osmocom/core/rate_ctr.h4
-rw-r--r--include/osmocom/core/select.h5
-rw-r--r--include/osmocom/core/serial.h5
-rw-r--r--include/osmocom/core/signal.h5
-rw-r--r--include/osmocom/core/socket.h5
-rw-r--r--include/osmocom/core/statistics.h5
-rw-r--r--include/osmocom/core/strrb.h5
-rw-r--r--include/osmocom/core/talloc.h5
-rw-r--r--include/osmocom/core/timer.h5
-rw-r--r--include/osmocom/core/timer_compat.h5
-rw-r--r--include/osmocom/core/utils.h5
-rw-r--r--include/osmocom/core/write_queue.h5
-rw-r--r--include/osmocom/crypt/auth.h5
-rw-r--r--include/osmocom/crypt/gprs_cipher.h5
-rw-r--r--include/osmocom/gprs/gprs_bssgp.h5
-rw-r--r--include/osmocom/gprs/gprs_bssgp_bss.h4
-rw-r--r--include/osmocom/gprs/gprs_msgb.h4
-rw-r--r--include/osmocom/gprs/gprs_ns.h5
-rw-r--r--include/osmocom/gprs/gprs_ns_frgre.h5
-rw-r--r--include/osmocom/gprs/protocol/gsm_08_16.h5
-rw-r--r--include/osmocom/gprs/protocol/gsm_08_18.h5
-rw-r--r--include/osmocom/gsm/a5.h5
-rw-r--r--include/osmocom/gsm/abis_nm.h5
-rw-r--r--include/osmocom/gsm/comp128.h6
-rw-r--r--include/osmocom/gsm/comp128v23.h5
-rw-r--r--include/osmocom/gsm/gan.h5
-rw-r--r--include/osmocom/gsm/gsm0411_smc.h5
-rw-r--r--include/osmocom/gsm/gsm0411_smr.h6
-rw-r--r--include/osmocom/gsm/gsm0411_utils.h5
-rw-r--r--include/osmocom/gsm/gsm0480.h5
-rw-r--r--include/osmocom/gsm/gsm0502.h5
-rw-r--r--include/osmocom/gsm/gsm0808.h5
-rw-r--r--include/osmocom/gsm/gsm48.h5
-rw-r--r--include/osmocom/gsm/gsm48_ie.h5
-rw-r--r--include/osmocom/gsm/gsm_utils.h6
-rw-r--r--include/osmocom/gsm/l1sap.h5
-rw-r--r--include/osmocom/gsm/lapd_core.h5
-rw-r--r--include/osmocom/gsm/lapdm.h5
-rw-r--r--include/osmocom/gsm/meas_rep.h5
-rw-r--r--include/osmocom/gsm/mncc.h5
-rw-r--r--include/osmocom/gsm/prim.h5
-rw-r--r--include/osmocom/gsm/protocol/gsm_03_41.h5
-rw-r--r--include/osmocom/gsm/protocol/gsm_04_08.h5
-rw-r--r--include/osmocom/gsm/protocol/gsm_04_11.h5
-rw-r--r--include/osmocom/gsm/protocol/gsm_04_12.h5
-rw-r--r--include/osmocom/gsm/protocol/gsm_04_80.h5
-rw-r--r--include/osmocom/gsm/protocol/gsm_08_08.h5
-rw-r--r--include/osmocom/gsm/protocol/gsm_08_58.h5
-rw-r--r--include/osmocom/gsm/protocol/gsm_12_21.h5
-rw-r--r--include/osmocom/gsm/protocol/gsm_44_318.h4
-rw-r--r--include/osmocom/gsm/protocol/ipaccess.h5
-rw-r--r--include/osmocom/gsm/protocol/smpp34_osmocom.h5
-rw-r--r--include/osmocom/gsm/rsl.h5
-rw-r--r--include/osmocom/gsm/rxlev_stat.h5
-rw-r--r--include/osmocom/gsm/sysinfo.h5
-rw-r--r--include/osmocom/gsm/tlv.h5
-rw-r--r--include/osmocom/vty/buffer.h5
-rw-r--r--include/osmocom/vty/command.h4
-rw-r--r--include/osmocom/vty/logging.h5
-rw-r--r--include/osmocom/vty/misc.h5
-rw-r--r--include/osmocom/vty/telnet_interface.h5
-rw-r--r--include/osmocom/vty/vector.h5
-rw-r--r--include/osmocom/vty/vty.h5
-rw-r--r--src/gsm/milenage/aes.h5
-rw-r--r--src/gsm/milenage/aes_i.h5
-rw-r--r--src/gsm/milenage/aes_wrap.h5
-rw-r--r--src/gsm/milenage/milenage.h5
88 files changed, 88 insertions, 351 deletions
diff --git a/include/osmocom/codec/codec.h b/include/osmocom/codec/codec.h
index 81f5d4ba..d126e0f7 100644
--- a/include/osmocom/codec/codec.h
+++ b/include/osmocom/codec/codec.h
@@ -1,5 +1,4 @@
-#ifndef _OSMOCOM_CODEC_H
-#define _OSMOCOM_CODEC_H
+#pragma once
#include <stdint.h>
@@ -16,5 +15,3 @@ extern const uint16_t gsm690_6_7_bitorder[]; /* AMR 6.7 kbits */
extern const uint16_t gsm690_5_9_bitorder[]; /* AMR 5.9 kbits */
extern const uint16_t gsm690_5_15_bitorder[]; /* AMR 5.15 kbits */
extern const uint16_t gsm690_4_75_bitorder[]; /* AMR 4.75 kbits */
-
-#endif /* _OSMOCOM_CODEC_H */
diff --git a/include/osmocom/core/application.h b/include/osmocom/core/application.h
index 34571698..ecaeaa8a 100644
--- a/include/osmocom/core/application.h
+++ b/include/osmocom/core/application.h
@@ -1,5 +1,4 @@
-#ifndef OSMO_APPLICATION_H
-#define OSMO_APPLICATION_H
+#pragma once
/*!
* \file application.h
@@ -19,5 +18,3 @@ void osmo_init_ignore_signals(void);
int osmo_init_logging(const struct log_info *);
int osmo_daemonize(void);
-
-#endif
diff --git a/include/osmocom/core/backtrace.h b/include/osmocom/core/backtrace.h
index a24290c5..0c9b6ef9 100644
--- a/include/osmocom/core/backtrace.h
+++ b/include/osmocom/core/backtrace.h
@@ -1,7 +1,4 @@
-#ifndef _OSMO_BACKTRACE_H_
-#define _OSMO_BACKTRACE_H_
+#pragma once
void osmo_generate_backtrace(void);
void osmo_log_backtrace(int subsys, int level);
-
-#endif
diff --git a/include/osmocom/core/bits.h b/include/osmocom/core/bits.h
index 4c685321..d4ab5056 100644
--- a/include/osmocom/core/bits.h
+++ b/include/osmocom/core/bits.h
@@ -1,5 +1,4 @@
-#ifndef _OSMO_BITS_H
-#define _OSMO_BITS_H
+#pragma once
#include <stdint.h>
@@ -74,5 +73,3 @@ uint32_t osmo_revbytebits_8(uint8_t x);
void osmo_revbytebits_buf(uint8_t *buf, int len);
/*! @} */
-
-#endif /* _OSMO_BITS_H */
diff --git a/include/osmocom/core/bitvec.h b/include/osmocom/core/bitvec.h
index 9c000d02..31382260 100644
--- a/include/osmocom/core/bitvec.h
+++ b/include/osmocom/core/bitvec.h
@@ -1,5 +1,4 @@
-#ifndef _BITVEC_H
-#define _BITVEC_H
+#pragma once
/* bit vector utility routines */
@@ -66,5 +65,3 @@ int bitvec_find_bit_pos(const struct bitvec *bv, unsigned int n, enum bit_value
int bitvec_spare_padding(struct bitvec *bv, unsigned int up_to_bit);
/*! @} */
-
-#endif /* _BITVEC_H */
diff --git a/include/osmocom/core/conv.h b/include/osmocom/core/conv.h
index 4cc791fa..e7f6bd6a 100644
--- a/include/osmocom/core/conv.h
+++ b/include/osmocom/core/conv.h
@@ -28,8 +28,7 @@
* Osmocom convolutional encoder and decoder
*/
-#ifndef __OSMO_CONV_H__
-#define __OSMO_CONV_H__
+#pragma once
#include <stdint.h>
@@ -142,5 +141,3 @@ int osmo_conv_decode(const struct osmo_conv_code *code,
/*! @} */
-
-#endif /* __OSMO_CONV_H__ */
diff --git a/include/osmocom/core/crc16.h b/include/osmocom/core/crc16.h
index 0e524176..83b2e5f7 100644
--- a/include/osmocom/core/crc16.h
+++ b/include/osmocom/core/crc16.h
@@ -15,8 +15,7 @@
* Version 2. See the file COPYING for more details.
*/
-#ifndef __CRC16_H
-#define __CRC16_H
+#pragma once
#include <stdint.h>
@@ -30,5 +29,3 @@ static inline uint16_t osmo_crc16_byte(uint16_t crc, const uint8_t data)
{
return (crc >> 8) ^ osmo_crc16_table[(crc ^ data) & 0xff];
}
-
-#endif /* __CRC16_H */
diff --git a/include/osmocom/core/crcXXgen.h.tpl b/include/osmocom/core/crcXXgen.h.tpl
index a931bc39..164f7201 100644
--- a/include/osmocom/core/crcXXgen.h.tpl
+++ b/include/osmocom/core/crcXXgen.h.tpl
@@ -20,8 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef __OSMO_CRCXXGEN_H__
-#define __OSMO_CRCXXGEN_H__
+#pragma once
/*! \addtogroup crcgen
* @{
@@ -54,6 +53,4 @@ void osmo_crcXXgen_set_bits(const struct osmo_crcXXgen_code *code,
/*! @} */
-#endif /* __OSMO_CRCXXGEN_H__ */
-
/* vim: set syntax=c: */
diff --git a/include/osmocom/core/crcgen.h b/include/osmocom/core/crcgen.h
index 69cef040..b39b55db 100644
--- a/include/osmocom/core/crcgen.h
+++ b/include/osmocom/core/crcgen.h
@@ -20,8 +20,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef __OSMO_CRCGEN_H__
-#define __OSMO_CRCGEN_H__
+#pragma once
/*! \defgroup crcgen Osmocom generic CRC routines
* @{
@@ -37,5 +36,3 @@
#include <osmocom/core/crc64gen.h>
/*! @} */
-
-#endif /* __OSMO_CRCGEN_H__ */
diff --git a/include/osmocom/core/defs.h b/include/osmocom/core/defs.h
index 5ffee046..aebe9258 100644
--- a/include/osmocom/core/defs.h
+++ b/include/osmocom/core/defs.h
@@ -1,5 +1,4 @@
-#ifndef OSMOCORE_DEFS_H
-#define OSMOCORE_DEFS_H
+#pragma once
/*! \defgroup utils General-purpose utility functions
* @{
@@ -46,5 +45,3 @@
#undef _OSMO_HAS_ATTRIBUTE_DEPRECATED
/*! @} */
-
-#endif
diff --git a/include/osmocom/core/gsmtap.h b/include/osmocom/core/gsmtap.h
index 4694219a..69bd108e 100644
--- a/include/osmocom/core/gsmtap.h
+++ b/include/osmocom/core/gsmtap.h
@@ -1,5 +1,4 @@
-#ifndef _GSMTAP_H
-#define _GSMTAP_H
+#pragma once
/* gsmtap header, pseudo-header in front of the actua GSM payload */
@@ -239,5 +238,3 @@ struct gsmtap_hdr {
uint8_t res; /* reserved for future use (RFU) */
} __attribute__((packed));
-
-#endif /* _GSMTAP_H */
diff --git a/include/osmocom/core/gsmtap_util.h b/include/osmocom/core/gsmtap_util.h
index eaa32a00..a5c03e77 100644
--- a/include/osmocom/core/gsmtap_util.h
+++ b/include/osmocom/core/gsmtap_util.h
@@ -1,5 +1,4 @@
-#ifndef _GSMTAP_UTIL_H
-#define _GSMTAP_UTIL_H
+#pragma once
#include <stdint.h>
#include <osmocom/core/write_queue.h>
@@ -55,5 +54,3 @@ int gsmtap_send(struct gsmtap_inst *gti, uint16_t arfcn, uint8_t ts,
unsigned int len);
/*! @} */
-
-#endif /* _GSMTAP_UTIL_H */
diff --git a/include/osmocom/core/linuxlist.h b/include/osmocom/core/linuxlist.h
index fb99c5ec..b6841520 100644
--- a/include/osmocom/core/linuxlist.h
+++ b/include/osmocom/core/linuxlist.h
@@ -1,5 +1,4 @@
-#ifndef _LINUX_LLIST_H
-#define _LINUX_LLIST_H
+#pragma once
#include <stddef.h>
@@ -355,6 +354,3 @@ static inline void llist_splice_init(struct llist_head *llist,
#define llist_for_each_continue_rcu(pos, head) \
for ((pos) = (pos)->next, prefetch((pos)->next); (pos) != (head); \
(pos) = (pos)->next, ({ smp_read_barrier_depends(); 0;}), prefetch((pos)->next))
-
-
-#endif
diff --git a/include/osmocom/core/linuxrbtree.h b/include/osmocom/core/linuxrbtree.h
index 079f440d..ef8bc153 100644
--- a/include/osmocom/core/linuxrbtree.h
+++ b/include/osmocom/core/linuxrbtree.h
@@ -91,8 +91,7 @@ static inline struct page * rb_insert_page_cache(struct inode * inode,
-----------------------------------------------------------------------
*/
-#ifndef _LINUX_RBTREE_H
-#define _LINUX_RBTREE_H
+#pragma once
#include <stdlib.h>
@@ -156,5 +155,3 @@ static inline void rb_link_node(struct rb_node * node, struct rb_node * parent,
*rb_link = node;
}
-
-#endif /* _LINUX_RBTREE_H */
diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h
index 1d57e22c..caeea065 100644
--- a/include/osmocom/core/logging.h
+++ b/include/osmocom/core/logging.h
@@ -1,5 +1,4 @@
-#ifndef _OSMOCORE_LOGGING_H
-#define _OSMOCORE_LOGGING_H
+#pragma once
/*! \defgroup logging Osmocom logging framework
* @{
@@ -216,5 +215,3 @@ struct log_target *log_target_find(int type, const char *fname);
extern struct llist_head osmo_log_target_list;
/*! @} */
-
-#endif /* _OSMOCORE_LOGGING_H */
diff --git a/include/osmocom/core/loggingrb.h b/include/osmocom/core/loggingrb.h
index a6f377b1..acdccfb9 100644
--- a/include/osmocom/core/loggingrb.h
+++ b/include/osmocom/core/loggingrb.h
@@ -1,5 +1,4 @@
-#ifndef _LOGGINGRB_H
-#define _LOGGINGRB_H
+#pragma once
/* (C) 2012-2013 by Katerina Barone-Adesi <kat.obsc@gmail.com>
* All Rights Reserved
@@ -36,5 +35,3 @@ const char *log_target_rb_get(struct log_target const *target, size_t logindex);
struct log_target *log_target_create_rb(size_t size);
/*! @} */
-
-#endif /* _LOGGINGRB_H */
diff --git a/include/osmocom/core/msgb.h b/include/osmocom/core/msgb.h
index 33e8081f..bf83d677 100644
--- a/include/osmocom/core/msgb.h
+++ b/include/osmocom/core/msgb.h
@@ -1,5 +1,4 @@
-#ifndef _MSGB_H
-#define _MSGB_H
+#pragma once
/* (C) 2008 by Harald Welte <laforge@gnumonks.org>
* All Rights Reserved
@@ -413,5 +412,3 @@ uint8_t *msgb_data(const struct msgb *msg);
void msgb_set_talloc_ctx(void *ctx);
/*! @} */
-
-#endif /* _MSGB_H */
diff --git a/include/osmocom/core/msgfile.h b/include/osmocom/core/msgfile.h
index c5e67a45..cab97b22 100644
--- a/include/osmocom/core/msgfile.h
+++ b/include/osmocom/core/msgfile.h
@@ -19,8 +19,7 @@
*
*/
-#ifndef MSG_FILE_H
-#define MSG_FILE_H
+#pragma once
#include <osmocom/core/linuxlist.h>
@@ -45,5 +44,3 @@ struct osmo_config_list {
};
struct osmo_config_list* osmo_config_list_parse(void *ctx, const char *filename);
-
-#endif
diff --git a/include/osmocom/core/panic.h b/include/osmocom/core/panic.h
index fd5cf208..5d575c4b 100644
--- a/include/osmocom/core/panic.h
+++ b/include/osmocom/core/panic.h
@@ -1,5 +1,4 @@
-#ifndef OSMOCORE_PANIC_H
-#define OSMOCORE_PANIC_H
+#pragma once
/*! \addtogroup utils
* @{
@@ -16,5 +15,3 @@ extern void osmo_panic(const char *fmt, ...);
extern void osmo_set_panic_handler(osmo_panic_handler_t h);
/*! @} */
-
-#endif /* OSMOCORE_PANIC_H */
diff --git a/include/osmocom/core/plugin.h b/include/osmocom/core/plugin.h
index 6c0eccc6..aef1dfc9 100644
--- a/include/osmocom/core/plugin.h
+++ b/include/osmocom/core/plugin.h