[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42165] trunk/blender/source: replace FILE_MAXDIR + FILE_MAXFILE with FILE_MAX
Campbell Barton
ideasman42 at gmail.com
Sat Nov 26 05:07:46 CET 2011
Revision: 42165
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42165
Author: campbellbarton
Date: 2011-11-26 04:07:38 +0000 (Sat, 26 Nov 2011)
Log Message:
-----------
replace FILE_MAXDIR + FILE_MAXFILE with FILE_MAX
Modified Paths:
--------------
trunk/blender/source/blender/blenfont/intern/blf_dir.c
trunk/blender/source/blender/blenkernel/BKE_material.h
trunk/blender/source/blender/blenkernel/intern/blender.c
trunk/blender/source/blender/blenkernel/intern/movieclip.c
trunk/blender/source/blender/blenkernel/intern/packedFile.c
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/blenkernel/intern/text.c
trunk/blender/source/blender/blenlib/intern/path_util.c
trunk/blender/source/blender/blenlib/intern/storage.c
trunk/blender/source/blender/blenlib/intern/winstuff.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/readfile.h
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/interface_icons.c
trunk/blender/source/blender/editors/physics/physics_fluid.c
trunk/blender/source/blender/editors/render/render_opengl.c
trunk/blender/source/blender/editors/screen/screendump.c
trunk/blender/source/blender/editors/space_console/space_console.c
trunk/blender/source/blender/editors/space_file/filelist.c
trunk/blender/source/blender/editors/space_file/fsmenu.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
trunk/blender/source/blender/editors/space_text/text_ops.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/editors/util/ed_util.c
trunk/blender/source/blender/imbuf/intern/IMB_indexer.h
trunk/blender/source/blender/imbuf/intern/indexer.c
trunk/blender/source/blender/makesdna/intern/makesdna.c
trunk/blender/source/blender/makesrna/intern/rna_image_api.c
trunk/blender/source/blender/makesrna/intern/rna_main_api.c
trunk/blender/source/blender/makesrna/intern/rna_tracking.c
trunk/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
trunk/blender/source/blender/python/intern/bpy_interface.c
trunk/blender/source/blender/windowmanager/intern/wm_files.c
trunk/blender/source/creator/creator.c
trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
Modified: trunk/blender/source/blender/blenfont/intern/blf_dir.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_dir.c 2011-11-26 03:13:54 UTC (rev 42164)
+++ trunk/blender/source/blender/blenfont/intern/blf_dir.c 2011-11-26 04:07:38 UTC (rev 42165)
@@ -129,7 +129,7 @@
char *blf_dir_search(const char *file)
{
DirBLF *dir;
- char full_path[FILE_MAXDIR+FILE_MAXFILE];
+ char full_path[FILE_MAX];
char *s= NULL;
for(dir=global_font_dir.first; dir; dir= dir->next) {
Modified: trunk/blender/source/blender/blenkernel/BKE_material.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_material.h 2011-11-26 03:13:54 UTC (rev 42164)
+++ trunk/blender/source/blender/blenkernel/BKE_material.h 2011-11-26 04:07:38 UTC (rev 42165)
@@ -91,7 +91,7 @@
int material_in_material(struct Material *parmat, struct Material *mat);
-void ramp_blend(int type, float r_col[3], const float fac, const float col[3]);
+void ramp_blend(int type, float r_col[3], const float fac, const float col[3]);
/* copy/paste */
void clear_matcopybuf(void);
Modified: trunk/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/blender.c 2011-11-26 03:13:54 UTC (rev 42164)
+++ trunk/blender/source/blender/blenkernel/intern/blender.c 2011-11-26 04:07:38 UTC (rev 42165)
@@ -451,7 +451,7 @@
#define MAXUNDONAME 64
typedef struct UndoElem {
struct UndoElem *next, *prev;
- char str[FILE_MAXDIR+FILE_MAXFILE];
+ char str[FILE_MAX];
char name[MAXUNDONAME];
MemFile memfile;
uintptr_t undosize;
@@ -536,7 +536,7 @@
/* disk save version */
if(UNDO_DISK) {
static int counter= 0;
- char filepath[FILE_MAXDIR+FILE_MAXFILE];
+ char filepath[FILE_MAX];
char numstr[32];
int fileflags = G.fileflags & ~(G_FILE_HISTORY); /* don't do file history on undo */
@@ -702,7 +702,7 @@
UndoElem *uel;
MemFileChunk *chunk;
int file;
- char str[FILE_MAXDIR+FILE_MAXFILE];
+ char str[FILE_MAX];
if( (U.uiflag & USER_GLOBALUNDO)==0) return;
Modified: trunk/blender/source/blender/blenkernel/intern/movieclip.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/movieclip.c 2011-11-26 03:13:54 UTC (rev 42164)
+++ trunk/blender/source/blender/blenkernel/intern/movieclip.c 2011-11-26 04:07:38 UTC (rev 42165)
@@ -895,7 +895,7 @@
static void movieclip_build_proxy_ibuf(MovieClip *clip, ImBuf *ibuf, int cfra, int proxy_render_size, int undistorted)
{
- char name[FILE_MAXFILE+FILE_MAXDIR];
+ char name[FILE_MAX];
int quality, rectx, recty;
int size= size= rendersize_to_number(proxy_render_size);
ImBuf *scaleibuf;
Modified: trunk/blender/source/blender/blenkernel/intern/packedFile.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/packedFile.c 2011-11-26 03:13:54 UTC (rev 42164)
+++ trunk/blender/source/blender/blenkernel/intern/packedFile.c 2011-11-26 04:07:38 UTC (rev 42165)
@@ -168,7 +168,7 @@
{
PackedFile *pf = NULL;
int file, filelen;
- char name[FILE_MAXDIR+FILE_MAXFILE];
+ char name[FILE_MAX];
void *data;
/* render result has no filename and can be ignored
@@ -245,7 +245,7 @@
static char *find_new_name(char *name)
{
- char tempname[FILE_MAXDIR + FILE_MAXFILE];
+ char tempname[FILE_MAX];
char *newname;
size_t len;
@@ -268,8 +268,8 @@
{
int file, number, remove_tmp = FALSE;
int ret_value = RET_OK;
- char name[FILE_MAXDIR + FILE_MAXFILE];
- char tempname[FILE_MAXDIR + FILE_MAXFILE];
+ char name[FILE_MAX];
+ char tempname[FILE_MAX];
/* void *data; */
if (guimode) {} //XXX waitcursor(1);
@@ -337,7 +337,7 @@
struct stat st;
int ret_val, i, len, file;
char buf[4096];
- char name[FILE_MAXDIR + FILE_MAXFILE];
+ char name[FILE_MAX];
BLI_strncpy(name, filename, sizeof(name));
BLI_path_abs(name, G.main->name);
@@ -394,8 +394,8 @@
char *newname = NULL;
const char *temp = NULL;
- // char newabs[FILE_MAXDIR + FILE_MAXFILE];
- // char newlocal[FILE_MAXDIR + FILE_MAXFILE];
+ // char newabs[FILE_MAX];
+ // char newlocal[FILE_MAX];
if (pf != NULL) {
switch (how) {
@@ -445,7 +445,7 @@
int unpackVFont(ReportList *reports, VFont *vfont, int how)
{
- char localname[FILE_MAXDIR + FILE_MAXFILE], fi[FILE_MAXFILE];
+ char localname[FILE_MAX], fi[FILE_MAXFILE];
char *newname;
int ret_value = RET_ERROR;
Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c 2011-11-26 03:13:54 UTC (rev 42164)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c 2011-11-26 04:07:38 UTC (rev 42165)
@@ -1033,7 +1033,7 @@
*/
#define MAX_PTCACHE_PATH FILE_MAX
-#define MAX_PTCACHE_FILE ((FILE_MAXDIR+FILE_MAXFILE)*2)
+#define MAX_PTCACHE_FILE ((FILE_MAX)*2)
static int ptcache_path(PTCacheID *pid, char *filename)
{
@@ -1127,7 +1127,7 @@
{
PTCacheFile *pf;
FILE *fp = NULL;
- char filename[(FILE_MAXDIR+FILE_MAXFILE)*2];
+ char filename[(FILE_MAX)*2];
#ifndef DURIAN_POINTCACHE_LIB_OK
/* don't allow writing for linked objects */
Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2011-11-26 03:13:54 UTC (rev 42164)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2011-11-26 04:07:38 UTC (rev 42165)
@@ -652,7 +652,7 @@
/* note: caller should run calc_sequence(scene, seq) after */
void reload_sequence_new_file(Scene *scene, Sequence * seq, int lock_range)
{
- char str[FILE_MAXDIR+FILE_MAXFILE];
+ char str[FILE_MAX];
int prev_startdisp=0, prev_enddisp=0;
/* note: dont rename the strip, will break animation curves */
@@ -1156,7 +1156,7 @@
static void seq_open_anim_file(Sequence * seq)
{
- char name[FILE_MAXDIR+FILE_MAXFILE];
+ char name[FILE_MAX];
StripProxy * proxy;
if(seq->anim != NULL) {
@@ -2057,7 +2057,7 @@
static ImBuf * seq_render_strip(SeqRenderData context, Sequence * seq, float cfra)
{
ImBuf * ibuf = NULL;
- char name[FILE_MAXDIR+FILE_MAXFILE];
+ char name[FILE_MAX];
int use_preprocess = input_have_to_preprocess(context, seq, cfra);
float nr = give_stripelem_index(seq, cfra);
/* all effects are handled similarly with the exception of speed effect */
Modified: trunk/blender/source/blender/blenkernel/intern/text.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/text.c 2011-11-26 03:13:54 UTC (rev 42164)
+++ trunk/blender/source/blender/blenkernel/intern/text.c 2011-11-26 04:07:38 UTC (rev 42165)
@@ -237,12 +237,12 @@
int i, llen, len;
unsigned char *buffer;
TextLine *tmp;
- char str[FILE_MAXDIR+FILE_MAXFILE];
+ char str[FILE_MAX];
struct stat st;
if (!text || !text->name) return 0;
- BLI_strncpy(str, text->name, FILE_MAXDIR+FILE_MAXFILE);
+ BLI_strncpy(str, text->name, FILE_MAX);
BLI_path_abs(str, G.main->name);
fp= fopen(str, "r");
@@ -334,10 +334,10 @@
unsigned char *buffer;
TextLine *tmp;
Text *ta;
- char str[FILE_MAXDIR+FILE_MAXFILE];
+ char str[FILE_MAX];
struct stat st;
- BLI_strncpy(str, file, FILE_MAXDIR+FILE_MAXFILE);
+ BLI_strncpy(str, file, FILE_MAX);
if (relpath) /* can be NULL (bg mode) */
BLI_path_abs(str, relpath);
Modified: trunk/blender/source/blender/blenlib/intern/path_util.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/path_util.c 2011-11-26 03:13:54 UTC (rev 42164)
+++ trunk/blender/source/blender/blenlib/intern/path_util.c 2011-11-26 04:07:38 UTC (rev 42165)
@@ -426,8 +426,8 @@
void BLI_path_rel(char *file, const char *relfile)
{
char * lslash;
- char temp[FILE_MAXDIR+FILE_MAXFILE];
- char res[FILE_MAXDIR+FILE_MAXFILE];
+ char temp[FILE_MAX];
+ char res[FILE_MAX];
/* if file is already relative, bail out */
if(file[0]=='/' && file[1]=='/') return;
@@ -445,9 +445,9 @@
if (relfile[0] != '\\' && relfile[0] != '/') {
ptemp++;
}
- BLI_strncpy(ptemp, relfile, FILE_MAXDIR + FILE_MAXFILE-3);
+ BLI_strncpy(ptemp, relfile, FILE_MAX-3);
} else {
- BLI_strncpy(temp, relfile, FILE_MAXDIR + FILE_MAXFILE);
+ BLI_strncpy(temp, relfile, FILE_MAX);
}
if (BLI_strnlen(file, 3) > 2) {
@@ -539,7 +539,7 @@
int BLI_parent_dir(char *path)
{
static char parent_dir[]= {'.', '.', SEP, '\0'}; /* "../" or "..\\" */
- char tmp[FILE_MAXDIR+FILE_MAXFILE+4];
+ char tmp[FILE_MAX+4];
BLI_strncpy(tmp, path, sizeof(tmp)-4);
BLI_add_slash(tmp);
strcat(tmp, parent_dir);
@@ -744,7 +744,7 @@
#endif
if (wasrelative==1) {
- char cwd[FILE_MAXDIR + FILE_MAXFILE]= "";
+ char cwd[FILE_MAX]= "";
BLI_current_working_dir(cwd, sizeof(cwd)); /* incase the full path to the blend isnt used */
if (cwd[0] == '\0') {
@@ -757,8 +757,8 @@
* blend file which isnt a feature we want to use in this case since were dealing
* with a path from the command line, rather than from inside Blender */
- char origpath[FILE_MAXDIR + FILE_MAXFILE];
- BLI_strncpy(origpath, path, FILE_MAXDIR + FILE_MAXFILE);
+ char origpath[FILE_MAX];
+ BLI_strncpy(origpath, path, FILE_MAX);
BLI_make_file_string(NULL, path, cwd, origpath);
}
@@ -1256,7 +1256,7 @@
void BLI_make_existing_file(const char *name)
{
- char di[FILE_MAXDIR+FILE_MAXFILE], fi[FILE_MAXFILE];
+ char di[FILE_MAX], fi[FILE_MAXFILE];
BLI_strncpy(di, name, sizeof(di));
BLI_splitdirstring(di, fi);
@@ -1705,8 +1705,8 @@
type = BLI_exists(name);
if ((type == 0) || S_ISDIR(type)) {
#ifdef _WIN32
- char filename[FILE_MAXDIR+FILE_MAXFILE];
- char ext[FILE_MAXDIR+FILE_MAXFILE];
+ char filename[FILE_MAX];
+ char ext[FILE_MAX];
const char *extensions = getenv("PATHEXT");
if (extensions) {
char *temp;
@@ -1752,7 +1752,7 @@
*/
static void bli_where_am_i(char *fullname, const size_t maxlen, const char *name)
{
- char filename[FILE_MAXDIR+FILE_MAXFILE];
+ char filename[FILE_MAX];
const char *path = NULL, *temp;
#ifdef _WIN32
Modified: trunk/blender/source/blender/blenlib/intern/storage.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list