diff options
author | KoffeinFlummi <koffeinflummi@gmail.com> | 2015-08-19 00:05:18 +0200 |
---|---|---|
committer | KoffeinFlummi <koffeinflummi@gmail.com> | 2015-08-19 00:05:18 +0200 |
commit | c75d5ceba475e3c6d1fae475c610c53909a83a29 (patch) | |
tree | 4193c748edd8d1756862babd49e34df349ca8484 /include | |
parent | Add support for gaps option (diff) | |
parent | Merge pull request #72 from minus7/assert (diff) | |
download | sway-c75d5ceba475e3c6d1fae475c610c53909a83a29.tar.gz sway-c75d5ceba475e3c6d1fae475c610c53909a83a29.tar.zst sway-c75d5ceba475e3c6d1fae475c610c53909a83a29.zip |
Merge remote-tracking branch 'upstream/master' into gaps
Diffstat (limited to 'include')
-rw-r--r-- | include/log.h | 6 | ||||
-rw-r--r-- | include/stringop.h | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/log.h b/include/log.h index d35b2a54..44f84940 100644 --- a/include/log.h +++ b/include/log.h | |||
@@ -1,5 +1,6 @@ | |||
1 | #ifndef _SWAY_LOG_H | 1 | #ifndef _SWAY_LOG_H |
2 | #define _SWAY_LOG_H | 2 | #define _SWAY_LOG_H |
3 | #include <stdbool.h> | ||
3 | 4 | ||
4 | typedef enum { | 5 | typedef enum { |
5 | L_SILENT = 0, | 6 | L_SILENT = 0, |
@@ -10,7 +11,8 @@ typedef enum { | |||
10 | 11 | ||
11 | void init_log(int verbosity); | 12 | void init_log(int verbosity); |
12 | void sway_log_colors(int mode); | 13 | void sway_log_colors(int mode); |
13 | void sway_log(int verbosity, char* format, ...) __attribute__((format(printf,2,3))); | 14 | void sway_log(int verbosity, const char* format, ...) __attribute__((format(printf,2,3))); |
14 | void sway_abort(char* format, ...)__attribute__((format(printf,1,2))); | 15 | void sway_abort(const char* format, ...) __attribute__((format(printf,1,2))); |
16 | bool sway_assert(bool condition, const char* format, ...) __attribute__((format(printf,2,3))); | ||
15 | 17 | ||
16 | #endif | 18 | #endif |
diff --git a/include/stringop.h b/include/stringop.h index 03387345..a5346829 100644 --- a/include/stringop.h +++ b/include/stringop.h | |||
@@ -2,8 +2,8 @@ | |||
2 | #define _SWAY_STRINGOP_H | 2 | #define _SWAY_STRINGOP_H |
3 | #include "list.h" | 3 | #include "list.h" |
4 | 4 | ||
5 | void strip_whitespace(char *str); | 5 | char *strip_whitespace(char *str, int *trimmed_start); |
6 | void strip_comments(char *str); | 6 | char *strip_comments(char *str); |
7 | list_t *split_string(const char *str, const char *delims); | 7 | list_t *split_string(const char *str, const char *delims); |
8 | void free_flat_list(list_t *list); | 8 | void free_flat_list(list_t *list); |
9 | char *code_strchr(const char *string, char delimiter); | 9 | char *code_strchr(const char *string, char delimiter); |