Forgot to rename these

This commit is contained in:
Drew DeVault 2017-10-22 10:56:40 -04:00
parent 799f8b95b7
commit c5fff08f8a
13 changed files with 54 additions and 54 deletions

View file

@ -14,16 +14,16 @@ bool wlr_data_source_init(struct wlr_data_source *source,
struct wlr_data_source_impl *impl) {
source->impl = impl;
wl_signal_init(&source->events.destroy);
return (source->types = list_create());
return (source->types = wlr_list_create());
}
void wlr_data_source_finish(struct wlr_data_source *source) {
if (source) {
wl_signal_emit(&source->events.destroy, source);
if (source->types) {
list_foreach(source->types, free);
wlr_list_foreach(source->types, free);
}
list_free(source->types);
wlr_list_free(source->types);
}
}
@ -81,7 +81,7 @@ static void data_source_offer(struct wl_client *client,
return;
}
list_add(src->base.types, dtype);
wlr_list_add(src->base.types, dtype);
}
static void data_source_destroy(struct wl_client *client,

View file

@ -5,7 +5,7 @@
#include <stddef.h>
#include <wlr/types/wlr_list.h>
struct wlr_list *list_create(void) {
struct wlr_list *wlr_list_create(void) {
struct wlr_list *list = malloc(sizeof(struct wlr_list));
if (!list) {
return NULL;
@ -32,7 +32,7 @@ static bool list_resize(struct wlr_list *list) {
return true;
}
void list_free(struct wlr_list *list) {
void wlr_list_free(struct wlr_list *list) {
if (list == NULL) {
return;
}
@ -40,7 +40,7 @@ void list_free(struct wlr_list *list) {
free(list);
}
void list_foreach(struct wlr_list *list, void (*callback)(void *item)) {
void wlr_list_foreach(struct wlr_list *list, void (*callback)(void *item)) {
if (list == NULL || callback == NULL) {
return;
}
@ -49,7 +49,7 @@ void list_foreach(struct wlr_list *list, void (*callback)(void *item)) {
}
}
int list_add(struct wlr_list *list, void *item) {
int wlr_list_add(struct wlr_list *list, void *item) {
if (!list_resize(list)) {
return -1;
}
@ -57,11 +57,11 @@ int list_add(struct wlr_list *list, void *item) {
return list->length;
}
int list_push(struct wlr_list *list, void *item) {
return list_add(list, item);
int wlr_list_push(struct wlr_list *list, void *item) {
return wlr_list_add(list, item);
}
int list_insert(struct wlr_list *list, size_t index, void *item) {
int wlr_list_insert(struct wlr_list *list, size_t index, void *item) {
if (!list_resize(list)) {
return -1;
}
@ -71,26 +71,26 @@ int list_insert(struct wlr_list *list, size_t index, void *item) {
return list->length;
}
void list_del(struct wlr_list *list, size_t index) {
void wlr_list_del(struct wlr_list *list, size_t index) {
list->length--;
memmove(&list->items[index], &list->items[index + 1], sizeof(void*) * (list->length - index));
}
void *list_pop(struct wlr_list *list) {
void *wlr_list_pop(struct wlr_list *list) {
void *_ = list->items[list->length - 1];
list_del(list, list->length - 1);
wlr_list_del(list, list->length - 1);
return _;
}
void *list_peek(struct wlr_list *list) {
void *wlr_list_peek(struct wlr_list *list) {
return list->items[list->length - 1];
}
int list_cat(struct wlr_list *list, struct wlr_list *source) {
int wlr_list_cat(struct wlr_list *list, struct wlr_list *source) {
size_t old_len = list->length;
size_t i;
for (i = 0; i < source->length; ++i) {
if (list_add(list, source->items[i]) == -1) {
if (wlr_list_add(list, source->items[i]) == -1) {
list->length = old_len;
return -1;
}
@ -98,11 +98,11 @@ int list_cat(struct wlr_list *list, struct wlr_list *source) {
return list->length;
}
void list_qsort(struct wlr_list *list, int compare(const void *left, const void *right)) {
void wlr_list_qsort(struct wlr_list *list, int compare(const void *left, const void *right)) {
qsort(list->items, list->length, sizeof(void *), compare);
}
int list_seq_find(struct wlr_list *list,
int wlr_list_seq_find(struct wlr_list *list,
int compare(const void *item, const void *data),
const void *data) {
for (size_t i = 0; i < list->length; i++) {