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:
authorJean-Luc Peurière <jlp@nerim.net>2005-06-04 20:22:50 +0400
committerJean-Luc Peurière <jlp@nerim.net>2005-06-04 20:22:50 +0400
commitf38e0686d909aa0d2882c197aeff59eeefa17081 (patch)
tree7f2d4a2a3324fa915427bdec590a9654366ed17e /source/blender/src
parent0f82931e5fe89ed245a03a4608e524c2423c0d64 (diff)
new round of warning fixes. we are now down to 24 with Xcode on blender
alone with the following flags : -Wall -Wno-char-subscripts -Wno-missing-braces. the only one still worrying me is in rand.c line 57 : rand.c:57: integer constant is too large for "long" type but i have no clue about how correct cross-compiler and 32/64 bits friendly see also my mail to commiter list for signed/unsigned issues
Diffstat (limited to 'source/blender/src')
-rw-r--r--source/blender/src/buttons_editing.c1
-rw-r--r--source/blender/src/drawtext.c2
-rw-r--r--source/blender/src/drawtime.c3
-rw-r--r--source/blender/src/editsima.c6
-rw-r--r--source/blender/src/edittime.c3
-rw-r--r--source/blender/src/filesel.c3
-rwxr-xr-xsource/blender/src/transform.c4
-rwxr-xr-xsource/blender/src/transform_generics.c4
8 files changed, 17 insertions, 9 deletions
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c
index b5bfffdd0af..49fdf7fad67 100644
--- a/source/blender/src/buttons_editing.c
+++ b/source/blender/src/buttons_editing.c
@@ -169,6 +169,7 @@ extern ListBase editNurb;
/* *************************** static functions prototypes ****************** */
void validate_editbonebutton(EditBone *);
+VFont *exist_vfont(char *str);
/* *************************** MESH DECIMATE ******************************** */
diff --git a/source/blender/src/drawtext.c b/source/blender/src/drawtext.c
index 1cb82581e9f..a6ee39907bb 100644
--- a/source/blender/src/drawtext.c
+++ b/source/blender/src/drawtext.c
@@ -1378,7 +1378,7 @@ void run_python_script(SpaceText *st)
}
}
-void set_tabs(Text *text)
+static void set_tabs(Text *text)
{
SpaceText *st = curarea->spacedata.first;
st->currtab_set = setcurr_tab(text);
diff --git a/source/blender/src/drawtime.c b/source/blender/src/drawtime.c
index b01a13e9572..a41f9c86ce3 100644
--- a/source/blender/src/drawtime.c
+++ b/source/blender/src/drawtime.c
@@ -65,6 +65,9 @@
#include "blendef.h"
+/* ---- prototypes ------ */
+void drawtimespace(ScrArea *, void *);
+
static void draw_cfra_time(SpaceTime *stime)
{
diff --git a/source/blender/src/editsima.c b/source/blender/src/editsima.c
index cff2546e6ee..fc6506579ab 100644
--- a/source/blender/src/editsima.c
+++ b/source/blender/src/editsima.c
@@ -945,7 +945,7 @@ static int msel_hit(float *limit, unsigned int *hitarray, unsigned int vertexid,
return 0;
}
-void find_nearest_tface(TFace **nearesttf, MFace **nearestmf)
+static void find_nearest_tface(TFace **nearesttf, MFace **nearestmf)
{
Mesh *me;
TFace *tf;
@@ -987,7 +987,7 @@ void find_nearest_tface(TFace **nearesttf, MFace **nearestmf)
}
}
-int nearest_uv_between(TFace *tf, int nverts, int id, short *mval, short *uval)
+static int nearest_uv_between(TFace *tf, int nverts, int id, short *mval, short *uval)
{
float m[3], v1[3], v2[3], c1, c2;
int id1, id2;
@@ -1014,7 +1014,7 @@ int nearest_uv_between(TFace *tf, int nverts, int id, short *mval, short *uval)
return (c1*c2 >= 0.0f);
}
-void find_nearest_uv(TFace **nearesttf, unsigned int *nearestv, int *nearestuv)
+static void find_nearest_uv(TFace **nearesttf, unsigned int *nearestv, int *nearestuv)
{
Mesh *me;
TFace *tf;
diff --git a/source/blender/src/edittime.c b/source/blender/src/edittime.c
index e19771d0fdb..0bb4250c5a4 100644
--- a/source/blender/src/edittime.c
+++ b/source/blender/src/edittime.c
@@ -79,6 +79,9 @@
#include "PIL_time.h"
+/* declarations */
+void winqreadtimespace(ScrArea *, void *, BWinEvent *);
+
/* ************* Timeline marker code **************** */
/* add TimeMarker at curent frame */
diff --git a/source/blender/src/filesel.c b/source/blender/src/filesel.c
index 5e8d2e17b6f..929b8a93228 100644
--- a/source/blender/src/filesel.c
+++ b/source/blender/src/filesel.c
@@ -1020,7 +1020,8 @@ static int calc_filesel_line(SpaceFile *sfile, int nr, int *valx, int *valy)
static void set_active_file(SpaceFile *sfile, int act)
{
struct direntry *file;
- int num, redraw= 0, newflag;
+ int num, redraw= 0;
+ unsigned int newflag;
int old=0, newi=0;
file= sfile->filelist;
diff --git a/source/blender/src/transform.c b/source/blender/src/transform.c
index 74029823204..bc26252007a 100755
--- a/source/blender/src/transform.c
+++ b/source/blender/src/transform.c
@@ -221,7 +221,7 @@ void checkFirstTime() {
memset(&Trans, 0, sizeof(TransInfo));
}
-void transformEvent(unsigned short event, short val) {
+static void transformEvent(unsigned short event, short val) {
float mati[3][3];
char cmode = constraintModeToChar(&Trans);
Mat3One(mati);
@@ -1052,7 +1052,7 @@ static void TransMat3ToSize( float mat[][3], float smat[][3], float *size)
}
-void ElementResize(TransInfo *t, TransData *td, float mat[3][3]) {
+static void ElementResize(TransInfo *t, TransData *td, float mat[3][3]) {
float tmat[3][3], smat[3][3], center[3];
float vec[3];
diff --git a/source/blender/src/transform_generics.c b/source/blender/src/transform_generics.c
index 6a4fefde029..2171978e336 100755
--- a/source/blender/src/transform_generics.c
+++ b/source/blender/src/transform_generics.c
@@ -472,7 +472,7 @@ void postTrans (TransInfo *t)
}
-void apply_grid3(float *val, int max_index, float fac1, float fac2, float fac3)
+static void apply_grid3(float *val, int max_index, float fac1, float fac2, float fac3)
{
/* fac1 is for 'nothing', fac2 for CTRL, fac3 for SHIFT */
int invert = U.flag & USER_AUTOGRABGRID;
@@ -541,7 +541,7 @@ static void restore_ipokey(float *poin, float *old)
}
}
-void restoreElement(TransData *td) {
+static void restoreElement(TransData *td) {
/* TransData for crease has no loc */
if (td->loc) {
VECCOPY(td->loc, td->iloc);