diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-01-02 13:13:17 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-02 13:13:17 +0300 |
| commit | 8c86d2da3ab732a3ec0915c6e0328c09f99e15f1 (patch) | |
| tree | f4da850b2ab4fe01c987ccdd90e3e74df5bfef4b /source/blender/blenkernel/intern | |
| parent | 6127bcf854cd81ef0d14efb1a88b231da33a9d93 (diff) | |
Quiet warnings from last commit.
Janne: could you check if ptcache_file_pointers_seek() & ptcache_read_init() can be removed?
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/anim_sys.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/pointcache.c | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index b81d611065d..1ddf6a73abd 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -886,7 +886,7 @@ KS_Path *BKE_keyingset_add_path (KeyingSet *ks, ID *id, const char group_name[], /* just store absolute info */ ksp->id= id; if (group_name) - BLI_snprintf(ksp->group, 64, group_name); + BLI_strncpy(ksp->group, group_name, sizeof(ksp->group)); else ksp->group[0]= '\0'; diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 6b08f17713d..24edead4751 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -1059,7 +1059,6 @@ static int ptcache_file_compressed_write(PTCacheFile *pf, unsigned char *in, siz if(compressed == 2) { - uint32_t size = (uint32_t) sizeOfIt; ptcache_file_write(pf, &sizeOfIt, 1, sizeof(uint32_t)); ptcache_file_write(pf, props, sizeOfIt, sizeof(unsigned char)); } @@ -1158,6 +1157,7 @@ static void ptcache_file_pointers_init(PTCacheFile *pf) pf->cur[BPHYS_DATA_BOIDS] = (data_types & (1<<BPHYS_DATA_BOIDS)) ? &pf->data.boids : NULL; } +#if 0 // UNUSED static void ptcache_file_pointers_seek(int index, PTCacheFile *pf) { int i, size=0; @@ -1190,6 +1190,8 @@ static void ptcache_file_pointers_seek(int index, PTCacheFile *pf) ptcache_file_pointers_init(pf); } +#endif + void BKE_ptcache_mem_pointers_init(PTCacheMem *pm) { int data_types = pm->data_types; @@ -1528,6 +1530,8 @@ cleanup: return ret; } + +#if 0 // UNUSED static int ptcache_read_init(PTCacheID *pid, void **cache, int *totpoint) { if(*cache==NULL) @@ -1563,6 +1567,8 @@ static int ptcache_read_init(PTCacheID *pid, void **cache, int *totpoint) return pm->frame; } } +#endif + static int ptcache_read_stream(PTCacheID *pid, int cfra) { PTCacheFile *pf = ptcache_file_open(pid, PTCACHE_FILE_READ, cfra); @@ -1811,7 +1817,6 @@ static int ptcache_write(PTCacheID *pid, int cfra, int overwrite) if(overwrite) { if(cache->flag & PTCACHE_DISK_CACHE) { - PTCacheFile *pf = NULL; int fra = cfra-1; while(fra >= cache->startframe && !BKE_ptcache_id_exist(pid, fra)) |