diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-10-28 09:17:09 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-28 09:17:09 +0400 |
commit | ff837cbe9b2a27678a6111207ce60b64f44d5917 (patch) | |
tree | de1f188ed4d2b0659a8ebecb3a1e8b4792483065 /source/blender/makesdna/intern | |
parent | c914b11614fff23bca5b601da24f02ab51b9db52 (diff) | |
parent | 4b635d16316d12dd4c57e1dcf99092551e6bbe35 (diff) |
svn merge -r41310:41329 ^/trunk/blender
Diffstat (limited to 'source/blender/makesdna/intern')
-rw-r--r-- | source/blender/makesdna/intern/makesdna.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index 39cb1743c25..a966523d990 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -168,35 +168,35 @@ static int additional_slen_offset; * \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 @@ int add_type(const char *str, int len) * 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 @@ short *add_struct(int namecode) 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 @@ static int make_structDNA(char *baseDirectory, FILE *file) /* ************************* 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); |