Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2008-11-11 07:42:15 +0300
committerCampbell Barton <ideasman42@gmail.com>2008-11-11 07:42:15 +0300
commit13fe65cf466a75b8ae0af4781e872b2e3805e66e (patch)
treed41a75b53fa5f39a5fa428a115524c3c5c1e118f
parent8b32ad784b609cc131c498e6db7ec4a6bf784458 (diff)
removed some warnings
-rw-r--r--source/blender/blenlib/BLI_blenlib.h2
-rw-r--r--source/blender/src/poselib.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenlib/BLI_blenlib.h b/source/blender/blenlib/BLI_blenlib.h
index 4bbda9709d7..13d5b5fe829 100644
--- a/source/blender/blenlib/BLI_blenlib.h
+++ b/source/blender/blenlib/BLI_blenlib.h
@@ -416,7 +416,7 @@ void *BLI_pointer_from_int(int val);
* @param member The name of a member field of @a strct
* @retval The offset in bytes of @a member within @a strct
*/
-#define BLI_STRUCT_OFFSET(strct, member) ((int) &((strct*) 0)->member)
+#define BLI_STRUCT_OFFSET(strct, member) ((int)(intptr_t) &((strct*) 0)->member)
#ifdef __cplusplus
}
diff --git a/source/blender/src/poselib.c b/source/blender/src/poselib.c
index b819dd2a865..13520c94b87 100644
--- a/source/blender/src/poselib.c
+++ b/source/blender/src/poselib.c
@@ -508,7 +508,7 @@ void poselib_rename_pose (Object *ob)
if (marker == NULL) return;
/* get name of pose */
- sprintf(name, marker->name);
+ strncpy(name, marker->name, sizeof(name));
if (sbutton(name, 0, sizeof(name)-1, "Name: ") == 0)
return;