diff options
-rw-r--r-- | include/stringop.h | 1 | ||||
-rw-r--r-- | sway/stringop.c | 9 | ||||
-rw-r--r-- | wayland/client.c | 12 |
3 files changed, 6 insertions, 16 deletions
diff --git a/include/stringop.h b/include/stringop.h index 49bfa771..febbbaba 100644 --- a/include/stringop.h +++ b/include/stringop.h | |||
@@ -33,5 +33,4 @@ char *cmdsep(char **stringp, const char *delim); | |||
33 | // Split string into 2 by delim, handle quotes | 33 | // Split string into 2 by delim, handle quotes |
34 | char *argsep(char **stringp, const char *delim); | 34 | char *argsep(char **stringp, const char *delim); |
35 | 35 | ||
36 | char *strdup(const char *); | ||
37 | #endif | 36 | #endif |
diff --git a/sway/stringop.c b/sway/stringop.c index 31a036c3..8d6cac2f 100644 --- a/sway/stringop.c +++ b/sway/stringop.c | |||
@@ -362,12 +362,3 @@ char *argsep(char **stringp, const char *delim) { | |||
362 | found: | 362 | found: |
363 | return start; | 363 | return start; |
364 | } | 364 | } |
365 | |||
366 | char *strdup(const char *str) { | ||
367 | char *dup = malloc(strlen(str) + 1); | ||
368 | if (dup) { | ||
369 | strcpy(dup, str); | ||
370 | } | ||
371 | return dup; | ||
372 | } | ||
373 | |||
diff --git a/wayland/client.c b/wayland/client.c index b5e5b51a..5c5c0751 100644 --- a/wayland/client.c +++ b/wayland/client.c | |||
@@ -104,8 +104,8 @@ static int create_pool_file(size_t size) { | |||
104 | } | 104 | } |
105 | 105 | ||
106 | static void buffer_release(void *data, struct wl_buffer *buffer) { | 106 | static void buffer_release(void *data, struct wl_buffer *buffer) { |
107 | struct client_state *state = data; | 107 | struct client_state *state = data; |
108 | state->busy = false; | 108 | state->busy = false; |
109 | sway_log(L_INFO, "buffer release"); | 109 | sway_log(L_INFO, "buffer release"); |
110 | } | 110 | } |
111 | 111 | ||
@@ -138,9 +138,9 @@ struct buffer *create_buffer(struct client_state *state, | |||
138 | 138 | ||
139 | static void frame_callback(void *data, struct wl_callback *callback, uint32_t time) { | 139 | static void frame_callback(void *data, struct wl_callback *callback, uint32_t time) { |
140 | sway_log(L_INFO, "frame callback"); | 140 | sway_log(L_INFO, "frame callback"); |
141 | struct client_state *state = data; | 141 | struct client_state *state = data; |
142 | wl_callback_destroy(callback); | 142 | wl_callback_destroy(callback); |
143 | state->frame_cb = NULL; | 143 | state->frame_cb = NULL; |
144 | } | 144 | } |
145 | 145 | ||
146 | static const struct wl_callback_listener listener = { | 146 | static const struct wl_callback_listener listener = { |
@@ -177,7 +177,7 @@ struct client_state *client_setup(void) { | |||
177 | 177 | ||
178 | int client_prerender(struct client_state *state) { | 178 | int client_prerender(struct client_state *state) { |
179 | wl_display_dispatch_pending(state->display); | 179 | wl_display_dispatch_pending(state->display); |
180 | wl_display_flush(state->display); | 180 | wl_display_flush(state->display); |
181 | return 1; | 181 | return 1; |
182 | } | 182 | } |
183 | 183 | ||