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 | 4c688cba4e3528921656d63a09f7015cae13cd0c (diff) | |
| parent | 443ae9b89e9e1534407c2dd273a4e47ddb3610c7 (diff) | |
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 @@ #ifndef _SWAY_LOG_H #define _SWAY_LOG_H +#include <stdbool.h> typedef enum { L_SILENT = 0, @@ -10,7 +11,8 @@ typedef enum { void init_log(int verbosity); void sway_log_colors(int mode); -void sway_log(int verbosity, char* format, ...) __attribute__((format(printf,2,3))); -void sway_abort(char* format, ...)__attribute__((format(printf,1,2))); +void sway_log(int verbosity, const char* format, ...) __attribute__((format(printf,2,3))); +void sway_abort(const char* format, ...) __attribute__((format(printf,1,2))); +bool sway_assert(bool condition, const char* format, ...) __attribute__((format(printf,2,3))); #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 @@ #define _SWAY_STRINGOP_H #include "list.h" -void strip_whitespace(char *str); -void strip_comments(char *str); +char *strip_whitespace(char *str, int *trimmed_start); +char *strip_comments(char *str); list_t *split_string(const char *str, const char *delims); void free_flat_list(list_t *list); char *code_strchr(const char *string, char delimiter); |