Revision: 41317
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41317
Author: campbellbarton
Date: 2011-10-27 14:41:26 +0000 (Thu, 27 Oct 2011)
Log Message:
-----------
use const for readonly strings and set some functions to static
Modified Paths:
--------------
trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp
trunk/blender/source/blender/blenkernel/BKE_image.h
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/collada/ArmatureImporter.cpp
trunk/blender/source/blender/collada/ArmatureImporter.h
trunk/blender/source/blender/makesdna/intern/makesdna.c
trunk/blender/source/blender/makesrna/intern/makesrna.c
trunk/blender/source/blender/python/generic/bpy_internal_import.c
trunk/blender/source/blender/python/generic/bpy_internal_import.h
trunk/blender/source/blender/render/intern/source/pipeline.c
trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
trunk/blender/source/gameengine/Converter/KX_ConvertActuators.h
trunk/blender/source/gameengine/GamePlayer/common/GPC_Engine.h
trunk/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_CameraActuator.h
trunk/blender/source/gameengine/Ketsji/KX_IpoActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_IpoActuator.h
trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
trunk/blender/source/gameengine/Ketsji/KX_PythonInit.h
trunk/blender/source/gameengine/Ketsji/KX_SceneActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_SceneActuator.h
trunk/blender/source/gameengine/VideoTexture/Texture.cpp
trunk/blender/source/gameengine/VideoTexture/Texture.h
Modified: trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp 2011-10-27
14:40:59 UTC (rev 41316)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp 2011-10-27
14:41:26 UTC (rev 41317)
@@ -1585,30 +1585,3 @@
return GHOST_kSuccess;
}
-
-/*
-
-void glutCustomCursor(char *data1, char *data2, int size)
-{
- Pixmap source, mask;
- Cursor cursor;
- XColor fg, bg;
-
- if(XAllocNamedColor(__glutDisplay, DefaultColormap(__glutDisplay,
__glutScreen),
- "White", &fg, &fg) == 0) return;
- if(XAllocNamedColor(__glutDisplay, DefaultColormap(__glutDisplay,
__glutScreen),
- "Red", &bg, &bg) == 0) return;
-
-
- source= XCreateBitmapFromData(__glutDisplay, xdraw, data2, size, size);
- mask= XCreateBitmapFromData(__glutDisplay, xdraw, data1, size, size);
-
- cursor= XCreatePixmapCursor(__glutDisplay, source, mask, &fg, &bg, 7,
7);
-
- XFreePixmap(__glutDisplay, source);
- XFreePixmap(__glutDisplay, mask);
-
- XDefineCursor(__glutDisplay, xdraw, cursor);
-}
-
-*/
Modified: trunk/blender/source/blender/blenkernel/BKE_image.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_image.h 2011-10-27 14:40:59 UTC
(rev 41316)
+++ trunk/blender/source/blender/blenkernel/BKE_image.h 2011-10-27 14:41:26 UTC
(rev 41317)
@@ -58,7 +58,7 @@
int BKE_imtype_to_ftype(int imtype);
int BKE_imtype_is_movie(int imtype);
-struct anim *openanim(char * name, int flags, int streamindex);
+struct anim *openanim(const char *name, int flags, int streamindex);
void image_de_interlace(struct Image *ima, int odd);
Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c 2011-10-27
14:40:59 UTC (rev 41316)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2011-10-27
14:41:26 UTC (rev 41317)
@@ -1500,7 +1500,7 @@
}
/* used by sequencer too */
-struct anim *openanim(char *name, int flags, int streamindex)
+struct anim *openanim(const char *name, int flags, int streamindex)
{
struct anim *anim;
struct ImBuf *ibuf;
Modified: trunk/blender/source/blender/collada/ArmatureImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/ArmatureImporter.cpp 2011-10-27
14:40:59 UTC (rev 41316)
+++ trunk/blender/source/blender/collada/ArmatureImporter.cpp 2011-10-27
14:41:26 UTC (rev 41317)
@@ -567,7 +567,7 @@
// is a child of a node (not joint), root should be true since
// this is where we build armature bones from
-void ArmatureImporter::set_pose ( Object * ob_arm , COLLADAFW::Node *
root_node , char *parentname, float parent_mat[][4])
+void ArmatureImporter::set_pose ( Object * ob_arm , COLLADAFW::Node *
root_node , const char *parentname, float parent_mat[][4])
{
char * bone_name = (char *) bc_get_joint_name ( root_node);
float mat[4][4];
Modified: trunk/blender/source/blender/collada/ArmatureImporter.h
===================================================================
--- trunk/blender/source/blender/collada/ArmatureImporter.h 2011-10-27
14:40:59 UTC (rev 41316)
+++ trunk/blender/source/blender/collada/ArmatureImporter.h 2011-10-27
14:41:26 UTC (rev 41317)
@@ -113,7 +113,7 @@
void fix_leaf_bones();
- void set_pose ( Object * ob_arm , COLLADAFW::Node * root_node ,char *
parentname, float parent_mat[][4]);
+ void set_pose ( Object * ob_arm , COLLADAFW::Node * root_node , const
char *parentname, float parent_mat[][4]);
#if 0
Modified: trunk/blender/source/blender/makesdna/intern/makesdna.c
===================================================================
--- trunk/blender/source/blender/makesdna/intern/makesdna.c 2011-10-27
14:40:59 UTC (rev 41316)
+++ trunk/blender/source/blender/makesdna/intern/makesdna.c 2011-10-27
14:41:26 UTC (rev 41317)
@@ -168,35 +168,35 @@
* \param str char
* \param len int
*/
-int add_type(const char *str, int len);
+static int add_type(const char *str, int len);
/**
* Add variable \c str to
* \param str
*/
-int add_name(char *str);
+static int add_name(const char *str);
/**
* Search whether this structure type was already found, and if not,
* add it.
*/
-short *add_struct(int namecode);
+static short *add_struct(int namecode);
/**
* Remove comments from this buffer. Assumes that the buffer refers to
* ascii-code text.
*/
-int preprocess_include(char *maindata, int len);
+static int preprocess_include(char *maindata, int len);
/**
* Scan this file for serializable types.
*/
-int convert_include(char *filename);
+static int convert_include(char *filename);
/**
* Determine how many bytes are needed for an array.
*/
-int arraysize(char *astr, int len);
+static int arraysize(char *astr, int len);
/**
* Determine how many bytes are needed for each struct.
@@ -267,12 +267,12 @@
* cases, unfortunately. These are explicitly checked.
*
* */
-int add_name(char *str)
+static int add_name(const char *str)
{
int nr, i, j, k;
char *cp;
char buf[255]; /* stupid limit, change it :) */
- char *name;
+ const char *name;
additional_slen_offset = 0;
@@ -422,7 +422,7 @@
return sp;
}
-int preprocess_include(char *maindata, int len)
+static int preprocess_include(char *maindata, int len)
{
int a, newlen, comment = 0;
char *cp, *temp, *md;
@@ -1087,7 +1087,7 @@
/* ************************* END MAKE DNA ********************** */
-static void make_bad_file(char *file, int line)
+static void make_bad_file(const char *file, int line)
{
FILE *fp= fopen(file, "w");
fprintf(fp, "#error \"Error! can't make correct DNA.c file from %s:%d,
STUPID!\"\n", __FILE__, line);
Modified: trunk/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/makesrna.c 2011-10-27
14:40:59 UTC (rev 41316)
+++ trunk/blender/source/blender/makesrna/intern/makesrna.c 2011-10-27
14:41:26 UTC (rev 41317)
@@ -2768,14 +2768,14 @@
fprintf(f, "}\n\n#endif /* __RNA_BLENDER_CPP_H__ */\n\n");
}
-static void make_bad_file(char *file, int line)
+static void make_bad_file(const char *file, int line)
{
FILE *fp= fopen(file, "w");
fprintf(fp, "#error \"Error! can't make correct RNA file from %s:%d,
STUPID!\"\n", __FILE__, line);
fclose(fp);
}
-static int rna_preprocess(char *outfile)
+static int rna_preprocess(const char *outfile)
{
BlenderRNA *brna;
StructDefRNA *ds;
Modified: trunk/blender/source/blender/python/generic/bpy_internal_import.c
===================================================================
--- trunk/blender/source/blender/python/generic/bpy_internal_import.c
2011-10-27 14:40:59 UTC (rev 41316)
+++ trunk/blender/source/blender/python/generic/bpy_internal_import.c
2011-10-27 14:41:26 UTC (rev 41317)
@@ -124,7 +124,7 @@
return PyImport_ExecCodeModule(modulename, text->compiled);
}
-PyObject *bpy_text_import_name(char *name, int *found)
+PyObject *bpy_text_import_name(const char *name, int *found)
{
Text *text;
char txtname[MAX_ID_NAME-2];
Modified: trunk/blender/source/blender/python/generic/bpy_internal_import.h
===================================================================
--- trunk/blender/source/blender/python/generic/bpy_internal_import.h
2011-10-27 14:40:59 UTC (rev 41316)
+++ trunk/blender/source/blender/python/generic/bpy_internal_import.h
2011-10-27 14:41:26 UTC (rev 41317)
@@ -49,7 +49,7 @@
void bpy_import_init(PyObject *builtins);
PyObject* bpy_text_import(struct Text *text);
-PyObject* bpy_text_import_name(char *name, int *found);
+PyObject* bpy_text_import_name(const char *name, int *found);
PyObject* bpy_text_reimport(PyObject *module, int *found);
/* void bpy_text_clear_modules(int clear_all);*/ /* Clear user
modules */
Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c
2011-10-27 14:40:59 UTC (rev 41316)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c
2011-10-27 14:41:26 UTC (rev 41317)
@@ -405,7 +405,7 @@
return "Unknown";
}
-static int passtype_from_name(char *str)
+static int passtype_from_name(const char *str)
{
if(strcmp(str, "Combined")==0)
Modified: trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
2011-10-27 14:40:59 UTC (rev 41316)
+++ trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
2011-10-27 14:41:26 UTC (rev 41317)
@@ -111,7 +111,7 @@
#define KX_BLENDERTRUNC(x) (( x < 0.0001 && x > -0.0001 ) ? 0.0 : x)
-void BL_ConvertActuators(char* maggiename,
+void BL_ConvertActuators(const char* maggiename,
struct Object* blenderobject,
KX_GameObject* gameobj,
SCA_LogicManager* logicmgr,
Modified: trunk/blender/source/gameengine/Converter/KX_ConvertActuators.h
===================================================================
--- trunk/blender/source/gameengine/Converter/KX_ConvertActuators.h
2011-10-27 14:40:59 UTC (rev 41316)
+++ trunk/blender/source/gameengine/Converter/KX_ConvertActuators.h
2011-10-27 14:41:26 UTC (rev 41317)
@@ -32,7 +32,7 @@
#ifndef __KX_CONVERTACTUATORS_H
#define __KX_CONVERTACTUATORS_H
-void BL_ConvertActuators(char* maggiename,
+void BL_ConvertActuators(const char* maggiename,
struct Object* blenderobject,
class KX_GameObject* gameobj,
class SCA_LogicManager* logicmgr,
Modified: trunk/blender/source/gameengine/GamePlayer/common/GPC_Engine.h
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/common/GPC_Engine.h
2011-10-27 14:40:59 UTC (rev 41316)
+++ trunk/blender/source/gameengine/GamePlayer/common/GPC_Engine.h
2011-10-27 14:41:26 UTC (rev 41317)
@@ -102,9 +102,9 @@
// Initialize() functions are not put here since they have
// different prototypes for Unix and Windows
void StartLoadingAnimation();
- bool Start(char *filename); // file-on-disk starter
+ bool Start(const char *filename); // file-on-disk starter
bool Start(unsigned char *blenderDataBuffer,
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
