mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-04-04 03:17:46 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into gaps

Browse source
This commit is contained in:
KoffeinFlummi 2015-08-19 00:05:18 +02:00
commit c75d5ceba4
13 changed files with 289 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/log.h
View file

@ -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

4
include/stringop.h
View file

@ -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);