Merge pull request #25 from dmercer-google/headers-for-cpp

Making utils headers available to c++
goToMain · Dec 15, 2023 · fb3202b · fb3202b
2 parents cd90eef + c985f62
commit fb3202b
Show file tree

Hide file tree

Showing 26 changed files with 208 additions and 0 deletions.
diff --git a/include/utils/arg_parser.h b/include/utils/arg_parser.h
@@ -9,6 +9,10 @@
 
 #include <stdlib.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define AP_HELP_SPACING		25
 
 #define AP_OPT_NOFLAG		0x00000000
@@ -56,4 +60,8 @@ void ap_init(const char *app_name, const char *app_desc);
 int ap_parse(int argc, char *argv[], struct ap_option *ap_opts, void *data);
 void ap_print_help(struct ap_option *ap_opts, int exit_code);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _UTIL_ARG_PARSER_H_ */
diff --git a/include/utils/assert.h b/include/utils/assert.h
@@ -10,6 +10,10 @@
 #include <stdio.h>
 #include <utils/utils.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define __ASSERT_PRINT(fmt, ...) printf(fmt, ##__VA_ARGS__)
 
 #define __ASSERT_LOC(test) \
@@ -29,4 +33,8 @@
                 }                                                         \
         } while (0)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _UTILS_ERROR_H_ */
diff --git a/include/utils/bus_server.h b/include/utils/bus_server.h
@@ -10,6 +10,10 @@
 #include <pthread.h>
 #include <utils/workqueue.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct {
 	int fd;
 	int max_clients;
@@ -22,4 +26,8 @@ typedef struct {
 int bus_server_start(bus_server_t *s, int max_clients, const char *path);
 void bus_server_stop(bus_server_t *s);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _UTILS_BUS_SERVER_H_ */
diff --git a/include/utils/byteorder.h b/include/utils/byteorder.h
@@ -3,6 +3,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #if !defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__)
 #  if (defined(__BYTE_ORDER__)  && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) || \
      (defined(__BYTE_ORDER) && __BYTE_ORDER == __BIG_ENDIAN) || \
@@ -101,4 +105,8 @@
 
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BYTEORDER_H_ */
diff --git a/include/utils/channel.h b/include/utils/channel.h
@@ -9,6 +9,10 @@
 
 #include <utils/hashmap.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 enum channel_errors {
 	CHANNEL_ERR_NONE,
 	CHANNEL_ERR_ALREADY_OPEN,
@@ -86,4 +90,8 @@ int channel_close(struct channel_manager *ctx, const char *device);
 
 void channel_manager_teardown(struct channel_manager *ctx);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _CHANNEL_H_ */
diff --git a/include/utils/circbuf.h b/include/utils/circbuf.h
@@ -9,6 +9,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /** --- Internal methods and structures. DON'T USE --------------------------- */
 typedef struct {
 	void * const buffer;
@@ -117,4 +121,8 @@ int __circbuf_free_space(circbuf_t *circbuf);
  */
 #define CIRCBUF_FS(buf)                     __circbuf_free_space(&buf)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _UTIL_CIRCBUF_H_ */
diff --git a/include/utils/crc32.h b/include/utils/crc32.h
@@ -4,6 +4,14 @@
 #include <stdint.h>
 #include <stddef.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 uint32_t compute_crc32(uint32_t seed, const uint8_t *buffer, size_t length);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _UTILS_CRC32_H_ */
diff --git a/include/utils/disjoint_set.h b/include/utils/disjoint_set.h
@@ -7,6 +7,10 @@
 #ifndef _UTIL_DISJOINT_SET_H_
 #define _UTIL_DISJOINT_SET_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define DISJOINT_SET_MAX 128
 
 struct disjoint_set {
@@ -20,4 +24,8 @@ int disjoint_set_find(struct disjoint_set *set, int a);
 void disjoint_set_union(struct disjoint_set *set, int a, int b);
 int disjoint_set_num_roots(struct disjoint_set *set);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _UTIL_DISJOINT_SET_H_ */
diff --git a/include/utils/event.h b/include/utils/event.h
@@ -9,6 +9,10 @@
 #ifndef _UTILS_EVENTS_H_
 #define _UTILS_EVENTS_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct {
 	int rfd;
 	int wfd;
@@ -21,4 +25,8 @@ void event_cleanup(event_t *e);
 bool event_set(event_t *e);
 bool event_is_set(event_t *e);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _UTILS_EVENTS_H_ */
diff --git a/include/utils/fdutils.h b/include/utils/fdutils.h
@@ -10,10 +10,18 @@
 #include <unistd.h>
 #include <sys/fcntl.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 int fcntl_setfl(int fd, int flag);
 
 ssize_t read_loop(int fd, void *buf, size_t max_len);
 ssize_t write_loop(int fd, const void *buf, size_t len);
 int flush_fd(int fd);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _UTILS_FDUTILS_H_ */
diff --git a/include/utils/file.h b/include/utils/file.h
@@ -11,6 +11,10 @@
 #include <stdint.h>
 #include <stdbool.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 int read_binary_file(const char *path, uint8_t **buf, size_t *size);
 int write_binary_file(const char *path, uint8_t *buf, size_t size);
 
@@ -27,4 +31,8 @@ void fs_path_walk_free(char **files);
 size_t file_size(FILE *fp);
 bool dir_exists(const char *path);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _UTIL_FILE_H_ */
diff --git a/include/utils/filo.h b/include/utils/filo.h
@@ -10,6 +10,10 @@
 #include <stdint.h>
 #include <stdbool.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct {
     void *buffer;
     size_t top;
@@ -179,4 +183,8 @@ void filo_free(filo_t *pfilo);
 
 
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _UTILS_FILO_H_ */
diff --git a/include/utils/hashmap.h b/include/utils/hashmap.h
@@ -10,6 +10,10 @@
 #include <stdint.h>
 #include <stddef.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct hash_map_item_s hash_map_item_t;
 typedef uint32_t hash_t;
 
@@ -50,4 +54,8 @@ int hash_map_it_next(hash_map_iterator_t *it, char **key, void **val);
 		hash_map_it_init(&it, map);                                   \
 		while (hash_map_it_next(&it, key_ref, (void **)val_ref) == 0)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _HASHMAP_H_ */
diff --git a/include/utils/list.h b/include/utils/list.h
@@ -10,6 +10,10 @@
 
 #include <stddef.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct node_s node_t;
 
 struct node_s {
@@ -61,4 +65,8 @@ int slist_popleft(slist_t *list, snode_t **node);
 int slist_remove_node(slist_t *list, snode_t *node);
 void slist_insert_node(slist_t *list, snode_t *after, snode_t *new);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _UTILS_LIST_H_ */
diff --git a/include/utils/logger.h b/include/utils/logger.h
@@ -11,6 +11,10 @@
 #include <stdio.h>
 #include <utils/utils.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define LOGGER_NAME_MAXLEN 16
 
 /**
@@ -85,4 +89,8 @@ void logger_set_name(logger_t *ctx, const char *name);
 
 #define LOG_PRINT(...) __logger_log(NULL, LOG_INFO,   __FILE__, __LINE__, __VA_ARGS__)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _LOGGER_H_ */
diff --git a/include/utils/memory.h b/include/utils/memory.h
@@ -9,6 +9,10 @@
 
 #include <stddef.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief Check p to be not NULL before calling safe_free()
  *
@@ -28,4 +32,8 @@ void *safe_realloc(void *data, size_t size);
 void *safe_strdup(const char *s);
 void *safe_realloc_zero(void *data, size_t old_size, size_t new_size);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _UTILS_MEMORY_H_ */
diff --git a/include/utils/procutils.h b/include/utils/procutils.h
@@ -7,6 +7,10 @@
 #ifndef _UTIL_PROCUTILS_H_
 #define _UTIL_PROCUTILS_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * read_pid() - Reads PID from `file`. The file's content must just be
  * be PID number, as written by a call to write_pid(). On success, copies
@@ -91,4 +95,8 @@ unsigned any_pid_of(const char* exe_name);
 char *parse_proc_cmdline(unsigned pid, int pos);
 
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _UTIL_PROCUTILS_H_ */
diff --git a/include/utils/queue.h b/include/utils/queue.h
@@ -10,6 +10,10 @@
 
 #include <utils/list.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define queue_node_t node_t
 
 typedef struct {
@@ -22,4 +26,8 @@ int queue_dequeue(queue_t *queue, queue_node_t **node);
 int queue_peek_last(queue_t *queue, queue_node_t **node);
 int queue_peek_first(queue_t *queue, queue_node_t **node);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _UTILS_QUEUE_H_ */
diff --git a/include/utils/random.h b/include/utils/random.h
@@ -11,6 +11,10 @@
 #include <stddef.h>
 #include <stdbool.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief Get the secure random bytes from the systems
  *
@@ -20,4 +24,8 @@
  */
 bool get_random_bytes(uint8_t *out, size_t len);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/include/utils/slab.h b/include/utils/slab.h
@@ -13,6 +13,10 @@
 
 #include <utils/utils.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct {
 	uint8_t *blob;
 	size_t size;
@@ -49,4 +53,8 @@ int slab_alloc(slab_t *slab, void **block);
  */
 int slab_free(slab_t *slab, void *block);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _UTILS_SLAB_H_ */