From d23e621f8fc772a7e87c6fb8f0c4fa90b08733ad Mon Sep 17 00:00:00 2001 From: Hanspeter Portner Date: Mon, 4 Jan 2021 22:19:15 +0100 Subject: [PATCH] make all functions static inline. --- VERSION | 2 +- osc.lv2/stream.h | 26 +++++++++++++------------- osc.lv2/util.h | 6 +++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/VERSION b/VERSION index c64f02b..a63a9fe 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.153 +0.1.159 diff --git a/osc.lv2/stream.h b/osc.lv2/stream.h index 47d338a..55c94d2 100644 --- a/osc.lv2/stream.h +++ b/osc.lv2/stream.h @@ -124,7 +124,7 @@ static const char *ser_prefix = "osc.serial://"; //FIXME serial -static int +static inline int _lv2_osc_stream_interface_attribs(int fd, int speed) { struct termios tty; @@ -163,7 +163,7 @@ _lv2_osc_stream_interface_attribs(int fd, int speed) #define LV2_OSC_STREAM_ERRNO(EV, ERRNO) ( (EV & (~LV2_OSC_ERR)) | (ERRNO) ) -static void +static inline void _close_socket(int *fd) { if(fd) @@ -177,7 +177,7 @@ _close_socket(int *fd) } } -static int +static inline int lv2_osc_stream_deinit(LV2_OSC_Stream *stream) { _close_socket(&stream->fd); @@ -186,7 +186,7 @@ lv2_osc_stream_deinit(LV2_OSC_Stream *stream) return 0; } -static int +static inline int _lv2_osc_stream_reinit(LV2_OSC_Stream *stream) { LV2_OSC_Enum ev = LV2_OSC_NONE; @@ -661,7 +661,7 @@ fail: return ev; } -static int +static inline int lv2_osc_stream_init(LV2_OSC_Stream *stream, const char *url, const LV2_OSC_Driver *driv, void *data) { @@ -682,7 +682,7 @@ lv2_osc_stream_init(LV2_OSC_Stream *stream, const char *url, #define SLIP_ESC_REPLACE 0335 // 0xDD, 221, ESC ESC_ESC means ESC data byte // SLIP encoding -static size_t +static inline size_t lv2_osc_slip_encode_inline(uint8_t *dst, size_t len) { if(len == 0) @@ -732,7 +732,7 @@ lv2_osc_slip_encode_inline(uint8_t *dst, size_t len) } // SLIP decoding -static size_t +static inline size_t lv2_osc_slip_decode_inline(uint8_t *dst, size_t len, size_t *size) { const uint8_t *src = dst; @@ -778,7 +778,7 @@ lv2_osc_slip_decode_inline(uint8_t *dst, size_t len, size_t *size) return 0; } -static LV2_OSC_Enum +static inline LV2_OSC_Enum _lv2_osc_stream_run_udp(LV2_OSC_Stream *stream) { LV2_OSC_Enum ev = LV2_OSC_NONE; @@ -859,7 +859,7 @@ _lv2_osc_stream_run_udp(LV2_OSC_Stream *stream) return ev; } -static LV2_OSC_Enum +static inline LV2_OSC_Enum _lv2_osc_stream_run_tcp(LV2_OSC_Stream *stream) { LV2_OSC_Enum ev = LV2_OSC_NONE; @@ -1148,7 +1148,7 @@ _lv2_osc_stream_run_tcp(LV2_OSC_Stream *stream) return ev; } -static LV2_OSC_Enum +static inline LV2_OSC_Enum _lv2_osc_stream_run_ser(LV2_OSC_Stream *stream) { LV2_OSC_Enum ev = LV2_OSC_NONE; @@ -1350,7 +1350,7 @@ _lv2_osc_stream_run_ser(LV2_OSC_Stream *stream) return ev; } -static LV2_OSC_Enum +static inline LV2_OSC_Enum lv2_osc_stream_run(LV2_OSC_Stream *stream) { LV2_OSC_Enum ev = LV2_OSC_NONE; @@ -1374,7 +1374,7 @@ lv2_osc_stream_run(LV2_OSC_Stream *stream) return ev; } -static int +static inline int lv2_osc_stream_get_file_descriptors(LV2_OSC_Stream *stream, int fds [2]) { if(!fds) @@ -1388,7 +1388,7 @@ lv2_osc_stream_get_file_descriptors(LV2_OSC_Stream *stream, int fds [2]) return 0; } -static LV2_OSC_Enum +static inline LV2_OSC_Enum lv2_osc_stream_pollin(LV2_OSC_Stream *stream, int timeout_ms) { int fd [2]; diff --git a/osc.lv2/util.h b/osc.lv2/util.h index 3517618..fdf2da3 100644 --- a/osc.lv2/util.h +++ b/osc.lv2/util.h @@ -72,7 +72,7 @@ static const char valid_format_chars [] = { '\0' }; -static bool +static inline bool lv2_osc_pattern_match(const char *from, const char *name, size_t len) { #if !defined(_WIN32) @@ -146,7 +146,7 @@ lv2_osc_pattern_match(const char *from, const char *name, size_t len) #endif } -static void +static inline void _lv2_osc_hooks_internal(const char *path, const char *from, const LV2_Atom_Tuple *arguments, const LV2_OSC_Hook *hooks) { @@ -177,7 +177,7 @@ _lv2_osc_hooks_internal(const char *path, const char *from, /** TODO */ -static void +static inline void lv2_osc_hooks(const char *path, const LV2_Atom_Tuple *arguments, void *data) { const LV2_OSC_Hook *hooks = data; -- 2.38.5