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>2011-11-26 08:07:38 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-11-26 08:07:38 +0400
commit6736576f6d576f9a06db14a76193c0c237e5cba1 (patch)
tree51bc0a37f1504dea826260340e80c085392d87aa /source/gameengine/GamePlayer
parentaf7288c407fbb4bb462f509d5782b660a29c4883 (diff)
replace FILE_MAXDIR + FILE_MAXFILE with FILE_MAX
Diffstat (limited to 'source/gameengine/GamePlayer')
-rw-r--r--source/gameengine/GamePlayer/ghost/GPG_ghost.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
index d6fb05f366e..e84df921fd5 100644
--- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
+++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
@@ -270,12 +270,12 @@ static void get_filename(int argc, char **argv, char *filename)
if (argc > 1) {
if (BLI_exists(argv[argc-1])) {
- BLI_strncpy(filename, argv[argc-1], FILE_MAXDIR + FILE_MAXFILE);
+ BLI_strncpy(filename, argv[argc-1], FILE_MAX);
}
if (::strncmp(argv[argc-1], "-psn_", 5)==0) {
static char firstfilebuf[512];
if (GHOST_HACK_getFirstFile(firstfilebuf)) {
- BLI_strncpy(filename, firstfilebuf, FILE_MAXDIR + FILE_MAXFILE);
+ BLI_strncpy(filename, firstfilebuf, FILE_MAX);
}
}
}
@@ -289,7 +289,7 @@ static void get_filename(int argc, char **argv, char *filename)
//::printf("looking for file: %s\n", filename);
if (BLI_exists(gamefile))
- BLI_strncpy(filename, gamefile, FILE_MAXDIR + FILE_MAXFILE);
+ BLI_strncpy(filename, gamefile, FILE_MAX);
delete [] gamefile;
}
@@ -298,7 +298,7 @@ static void get_filename(int argc, char **argv, char *filename)
filename[0] = '\0';
if(argc > 1)
- BLI_strncpy(filename, argv[argc-1], FILE_MAXDIR + FILE_MAXFILE);
+ BLI_strncpy(filename, argv[argc-1], FILE_MAX);
#endif // !_APPLE
}
@@ -737,8 +737,8 @@ int main(int argc, char** argv)
STR_String exitstring = "";
GPG_Application app(system);
bool firstTimeRunning = true;
- char filename[FILE_MAXDIR + FILE_MAXFILE];
- char pathname[FILE_MAXDIR + FILE_MAXFILE];
+ char filename[FILE_MAX];
+ char pathname[FILE_MAX];
char *titlename;
get_filename(argc_py_clamped, argv, filename);