diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-01-06 10:21:46 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-01-06 11:09:56 +0300 |
commit | 77c926933bf52a49088f6ab73304c9d876b1554d (patch) | |
tree | db94dbca00a55666b6de1a5d36e37dde80f9eab8 /source/blender/blenlib | |
parent | 1829c049be5e127230dac37a09584090f5ecdc7c (diff) |
cleanup: warnings
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/BLI_fileops.h | 2 | ||||
-rw-r--r-- | source/blender/blenlib/BLI_string.h | 2 | ||||
-rw-r--r-- | source/blender/blenlib/BLI_task.h | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/storage.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenlib/BLI_fileops.h b/source/blender/blenlib/BLI_fileops.h index 7b67a4fd7f4..86a8134376a 100644 --- a/source/blender/blenlib/BLI_fileops.h +++ b/source/blender/blenlib/BLI_fileops.h @@ -94,7 +94,7 @@ unsigned int BLI_filelist_dir_contents(const char *dir, struct direntry **fileli void BLI_filelist_duplicate( struct direntry **dest_filelist, struct direntry *src_filelist, unsigned int nrentries, void *(*dup_poin)(void *)); -void BLI_filelist_free(struct direntry *filelist, unsigned int nrentries, void (free_poin)(void *)); +void BLI_filelist_free(struct direntry *filelist, unsigned int nrentries, void (*free_poin)(void *)); /* Files */ diff --git a/source/blender/blenlib/BLI_string.h b/source/blender/blenlib/BLI_string.h index a390b419c18..d6e7f3dd86d 100644 --- a/source/blender/blenlib/BLI_string.h +++ b/source/blender/blenlib/BLI_string.h @@ -48,7 +48,7 @@ char *BLI_strdupcat(const char *__restrict str1, const char *__restrict str2) AT char *BLI_strncpy(char *__restrict dst, const char *__restrict src, const size_t maxncpy) ATTR_NONNULL(); -char *BLI_strncpy_ensure_pad(char *dst, const char *src, const char pad, size_t maxncpy) ATTR_NONNULL(); +char *BLI_strncpy_ensure_pad(char *__restrict dst, const char *__restrict src, const char pad, size_t maxncpy) ATTR_NONNULL(); size_t BLI_strncpy_rlen(char *__restrict dst, const char *__restrict src, const size_t maxncpy) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); diff --git a/source/blender/blenlib/BLI_task.h b/source/blender/blenlib/BLI_task.h index 8f85bc4ec31..2eaec024ce2 100644 --- a/source/blender/blenlib/BLI_task.h +++ b/source/blender/blenlib/BLI_task.h @@ -73,7 +73,7 @@ typedef enum TaskPriority { } TaskPriority; typedef struct TaskPool TaskPool; -typedef void (*TaskRunFunction)(TaskPool *pool, void *taskdata, int threadid); +typedef void (*TaskRunFunction)(TaskPool *__restrict pool, void *taskdata, int threadid); TaskPool *BLI_task_pool_create(TaskScheduler *scheduler, void *userdata); void BLI_task_pool_free(TaskPool *pool); diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c index 3e680cc8c5a..4c5268562ad 100644 --- a/source/blender/blenlib/intern/storage.c +++ b/source/blender/blenlib/intern/storage.c @@ -449,7 +449,7 @@ void BLI_filelist_free(struct direntry *filelist, unsigned int nrentries, void ( { unsigned int i; for (i = 0; i < nrentries; ++i) { - struct direntry * const entry = filelist + i; + struct direntry *entry = filelist + i; if (entry->image) { IMB_freeImBuf(entry->image); } |