[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11933] trunk/blender/source/blender: more warning fixes.
Stephen Swaney
sswaney at centurytel.net
Mon Sep 3 21:12:36 CEST 2007
Revision: 11933
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11933
Author: stiv
Date: 2007-09-03 21:12:36 +0200 (Mon, 03 Sep 2007)
Log Message:
-----------
more warning fixes.
sprinkle a few 'const char*'s around to remove warnings
about discarding qualifiers in imbuf code.
Modified Paths:
--------------
trunk/blender/source/blender/blenlib/BLI_blenlib.h
trunk/blender/source/blender/blenlib/intern/util.c
trunk/blender/source/blender/imbuf/IMB_imbuf.h
trunk/blender/source/blender/imbuf/intern/IMB_jpeg.h
trunk/blender/source/blender/imbuf/intern/anim.c
trunk/blender/source/blender/imbuf/intern/jpeg.c
trunk/blender/source/blender/imbuf/intern/readimage.c
Modified: trunk/blender/source/blender/blenlib/BLI_blenlib.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_blenlib.h 2007-09-03 17:28:50 UTC (rev 11932)
+++ trunk/blender/source/blender/blenlib/BLI_blenlib.h 2007-09-03 19:12:36 UTC (rev 11933)
@@ -173,7 +173,7 @@
* @param str The string to be duplicated
* @retval Returns the duplicated string
*/
-char* BLI_strdup(char *str);
+char* BLI_strdup(const char *str);
/**
* Duplicates the first @a len bytes of cstring @a str
Modified: trunk/blender/source/blender/blenlib/intern/util.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/util.c 2007-09-03 17:28:50 UTC (rev 11932)
+++ trunk/blender/source/blender/blenlib/intern/util.c 2007-09-03 19:12:36 UTC (rev 11933)
@@ -633,7 +633,7 @@
return n;
}
-char *BLI_strdup(char *str) {
+char *BLI_strdup(const char *str) {
return BLI_strdupn(str, strlen(str));
}
Modified: trunk/blender/source/blender/imbuf/IMB_imbuf.h
===================================================================
--- trunk/blender/source/blender/imbuf/IMB_imbuf.h 2007-09-03 17:28:50 UTC (rev 11932)
+++ trunk/blender/source/blender/imbuf/IMB_imbuf.h 2007-09-03 19:12:36 UTC (rev 11933)
@@ -158,7 +158,7 @@
*
* @attention Defined in readimage.c
*/
-struct ImBuf *IMB_loadiffname(char *naam, int flags);
+struct ImBuf *IMB_loadiffname(const char *naam, int flags);
/**
*
@@ -258,7 +258,7 @@
*
* @attention Defined in anim.c
*/
-struct anim * IMB_open_anim(char * name, int ib_flags);
+struct anim * IMB_open_anim(const char * name, int ib_flags);
void IMB_close_anim(struct anim * anim);
/**
Modified: trunk/blender/source/blender/imbuf/intern/IMB_jpeg.h
===================================================================
--- trunk/blender/source/blender/imbuf/intern/IMB_jpeg.h 2007-09-03 17:28:50 UTC (rev 11932)
+++ trunk/blender/source/blender/imbuf/intern/IMB_jpeg.h 2007-09-03 19:12:36 UTC (rev 11933)
@@ -45,7 +45,7 @@
int imb_is_a_jpeg(unsigned char *mem);
int imb_savejpeg(struct ImBuf * ibuf, char * name, int flags);
-struct ImBuf * imb_ibJpegImageFromFilename (char * filename, int flags);
+struct ImBuf * imb_ibJpegImageFromFilename (const char * filename, int flags);
struct ImBuf * imb_ibJpegImageFromMemory (unsigned char * buffer, int size, int flags);
#endif
Modified: trunk/blender/source/blender/imbuf/intern/anim.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/anim.c 2007-09-03 17:28:50 UTC (rev 11932)
+++ trunk/blender/source/blender/imbuf/intern/anim.c 2007-09-03 19:12:36 UTC (rev 11933)
@@ -338,12 +338,12 @@
}
-struct anim * IMB_open_anim(char * name, int ib_flags) {
+struct anim * IMB_open_anim( const char * name, int ib_flags) {
struct anim * anim;
anim = (struct anim*)MEM_callocN(sizeof(struct anim), "anim struct");
if (anim != NULL) {
- strcpy(anim->name, name);
+ strcpy(anim->name, name); /* fixme: possible buffer overflow here? */
anim->ib_flags = ib_flags;
}
return(anim);
Modified: trunk/blender/source/blender/imbuf/intern/jpeg.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/jpeg.c 2007-09-03 17:28:50 UTC (rev 11932)
+++ trunk/blender/source/blender/imbuf/intern/jpeg.c 2007-09-03 19:12:36 UTC (rev 11933)
@@ -345,7 +345,7 @@
return(ibuf);
}
-ImBuf * imb_ibJpegImageFromFilename (char * filename, int flags)
+ImBuf * imb_ibJpegImageFromFilename (const char * filename, int flags)
{
struct jpeg_decompress_struct _cinfo, *cinfo = &_cinfo;
struct jpeg_error_mgr jerr;
Modified: trunk/blender/source/blender/imbuf/intern/readimage.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/readimage.c 2007-09-03 17:28:50 UTC (rev 11932)
+++ trunk/blender/source/blender/imbuf/intern/readimage.c 2007-09-03 19:12:36 UTC (rev 11933)
@@ -268,7 +268,7 @@
}
-struct ImBuf *IMB_loadiffname(char *naam, int flags) {
+struct ImBuf *IMB_loadiffname(const char *naam, int flags) {
int file;
struct ImBuf *ibuf;
int buf[1];
More information about the Bf-blender-cvs
mailing list