archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

patch [#34103] use boolean in path functions and add comments.

Browse Source 
path_util_1.patch from Lawrence D'Oliveiro (ldo)
This commit is contained in:
Campbell Barton
2013-03-04 19:27:51 +00:00
parent 013a176c52
commit 0d5b028d43
26 changed files with 225 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenkernel/intern/customdata.c
View File

@@ -2861,7 +2861,7 @@ static int CustomData_is_property_layer(int type)
return 0;
}
static int cd_layer_find_dupe(CustomData *data, const char *name, int type, int index)
static bool cd_layer_find_dupe(CustomData *data, const char *name, int type, int index)
{
int i;
/* see if there is a duplicate */
@@ -2871,21 +2871,21 @@ static int cd_layer_find_dupe(CustomData *data, const char *name, int type, int
if (CustomData_is_property_layer(type)) {
if (CustomData_is_property_layer(layer->type) && strcmp(layer->name, name) == 0) {
return 1;
return true;
}
}
else {
if (i != index && layer->type == type && strcmp(layer->name, name) == 0) {
return 1;
return true;
}
}
}
}
return 0;
return false;
}
static int customdata_unique_check(void *arg, const char *name)
static bool customdata_unique_check(void *arg, const char *name)
{
struct {CustomData *data; int type; int index; } *data_arg = arg;
return cd_layer_find_dupe(data_arg->data, name, data_arg->type, data_arg->index);

8
source/blender/blenkernel/intern/deform.c
View File

@@ -432,22 +432,22 @@ int defgroup_flip_index(Object *ob, int index, int use_default)
return (flip_index == -1 && use_default) ? index : flip_index;
}
static int defgroup_find_name_dupe(const char *name, bDeformGroup *dg, Object *ob)
static bool defgroup_find_name_dupe(const char *name, bDeformGroup *dg, Object *ob)
{
bDeformGroup *curdef;
for (curdef = ob->defbase.first; curdef; curdef = curdef->next) {
if (dg != curdef) {
if (!strcmp(curdef->name, name)) {
return 1;
return true;
}
}
}
return 0;
return false;
}
static int defgroup_unique_check(void *arg, const char *name)
static bool defgroup_unique_check(void *arg, const char *name)
{
struct {Object *ob; void *dg; } *data = arg;
return defgroup_find_name_dupe(name, data->dg, data->ob);

14
source/blender/blenkernel/intern/dynamicpaint.c
View File

@@ -340,7 +340,7 @@ int dynamicPaint_outputLayerExists(struct DynamicPaintSurface *surface, Object *
return 0;
}
static int surface_duplicateOutputExists(void *arg, const char *name)
static bool surface_duplicateOutputExists(void *arg, const char *name)
{
DynamicPaintSurface *t_surface = (DynamicPaintSurface *)arg;
DynamicPaintSurface *surface = t_surface->canvas->surfaces.first;
@@ -349,11 +349,11 @@ static int surface_duplicateOutputExists(void *arg, const char *name)
if (surface != t_surface && surface->type == t_surface->type &&
surface->format == t_surface->format)
{
if (surface->output_name[0] != '\0' && !BLI_path_cmp(name, surface->output_name)) return 1;
if (surface->output_name2[0] != '\0' && !BLI_path_cmp(name, surface->output_name2)) return 1;
if (surface->output_name[0] != '\0' && !BLI_path_cmp(name, surface->output_name)) return true;
if (surface->output_name2[0] != '\0' && !BLI_path_cmp(name, surface->output_name2)) return true;
}
}
return 0;
return false;
}
static void surface_setUniqueOutputName(DynamicPaintSurface *surface, char *basename, int output)
@@ -367,15 +367,15 @@ static void surface_setUniqueOutputName(DynamicPaintSurface *surface, char *base
}
static int surface_duplicateNameExists(void *arg, const char *name)
static bool surface_duplicateNameExists(void *arg, const char *name)
{
DynamicPaintSurface *t_surface = (DynamicPaintSurface *)arg;
DynamicPaintSurface *surface = t_surface->canvas->surfaces.first;
for (; surface; surface = surface->next) {
if (surface != t_surface && !strcmp(name, surface->name)) return 1;
if (surface != t_surface && !strcmp(name, surface->name)) return true;
}
return 0;
return false;
}
void dynamicPaintSurface_setUniqueName(DynamicPaintSurface *surface, const char *basename)

2
source/blender/blenkernel/intern/nla.c
View File

@@ -1262,7 +1262,7 @@ void BKE_nlastrip_validate_fcurves(NlaStrip *strip)
/* Sanity Validation ------------------------------------ */
static int nla_editbone_name_check(void *arg, const char *name)
static bool nla_editbone_name_check(void *arg, const char *name)
{
return BLI_ghash_haskey((GHash *)arg, (void *)name);
}

2
source/blender/blenkernel/intern/packedFile.c
View File

@@ -591,7 +591,7 @@ void packLibraries(Main *bmain, ReportList *reports)
/* test for relativenss */
for (lib = bmain->library.first; lib; lib = lib->id.next)
if (0 == BLI_path_is_rel(lib->name))
if (!BLI_path_is_rel(lib->name))
break;
if (lib) {

1
source/blender/blenkernel/intern/pbvh_bmesh.c
View File

@@ -20,6 +20,7 @@
#include "MEM_guardedalloc.h"
#include "BLI_utildefines.h"
#include "BLI_buffer.h"
#include "BLI_ghash.h"
#include "BLI_heap.h"

4
source/blender/blenlib/BLI_ghash.h
View File

@@ -69,9 +69,9 @@ GHash *BLI_ghash_new(GHashHashFP hashfp, GHashCmpFP cmpfp, const char *info);
void BLI_ghash_free(GHash *gh, GHashKeyFreeFP keyfreefp, GHashValFreeFP valfreefp);
void BLI_ghash_insert(GHash *gh, void *key, void *val);
void *BLI_ghash_lookup(GHash *gh, const void *key);
int BLI_ghash_remove(GHash *gh, void *key, GHashKeyFreeFP keyfreefp, GHashValFreeFP valfreefp);
bool BLI_ghash_remove(GHash *gh, void *key, GHashKeyFreeFP keyfreefp, GHashValFreeFP valfreefp);
void *BLI_ghash_pop(GHash *gh, void *key, GHashKeyFreeFP keyfreefp);
int BLI_ghash_haskey(GHash *gh, const void *key);
bool BLI_ghash_haskey(GHash *gh, const void *key);
int BLI_ghash_size(GHash *gh);
/* *** */

33
source/blender/blenlib/BLI_path_util.h
View File

@@ -43,7 +43,7 @@ const char *BLI_getDefaultDocumentFolder(void);
char *BLI_get_folder(int folder_id, const char *subfolder);
char *BLI_get_folder_create(int folder_id, const char *subfolder);
char *BLI_get_user_folder_notest(int folder_id, const char *subfolder);
char *BLI_get_folder_version(const int id, const int ver, const int do_check);
char *BLI_get_folder_version(const int id, const int ver, const bool do_check);
/* folder_id */
@@ -86,11 +86,11 @@ void BLI_setenv_if_new(const char *env, const char *val);
void BLI_make_file_string(const char *relabase, char *string, const char *dir, const char *file);
void BLI_make_exist(char *dir);
void BLI_make_existing_file(const char *name);
void BLI_split_dirfile(const char *string, char *dir, char *file, const size_t dirlen, const size_t filelen);
void BLI_split_dir_part(const char *string, char *dir, const size_t dirlen);
void BLI_split_file_part(const char *string, char *file, const size_t filelen);
void BLI_join_dirfile(char *string, const size_t maxlen, const char *dir, const char *file);
char *BLI_path_basename(char *path);
void BLI_split_dirfile(const char *string, char *dir, char *file, size_t dirlen, size_t filelen);
void BLI_split_dir_part(const char *string, char *dir, size_t dirlen);
void BLI_split_file_part(const char *string, char *file, size_t filelen);
void BLI_join_dirfile(char *string, size_t maxlen, const char *dir, const char *file);
const char *BLI_path_basename(const char *path);
typedef enum bli_rebase_state {
BLI_REBASE_NO_SRCDIR = 0,
@@ -100,23 +100,24 @@ typedef enum bli_rebase_state {
int BLI_rebase_path(char *abs, size_t abs_len, char *rel, size_t rel_len, const char *base_dir, const char *src_dir, const char *dest_dir);
char *BLI_last_slash(const char *string);
const char *BLI_last_slash(const char *string);
int BLI_add_slash(char *string);
void BLI_del_slash(char *string);
char *BLI_first_slash(char *string);
const char *BLI_first_slash(const char *string);
void BLI_getlastdir(const char *dir, char *last, const size_t maxlen);
void BLI_getlastdir(const char *dir, char *last, size_t maxlen);
bool BLI_testextensie(const char *str, const char *ext);
bool BLI_testextensie_array(const char *str, const char **ext_array);
bool BLI_testextensie_glob(const char *str, const char *ext_fnmatch);
int BLI_replace_extension(char *path, size_t maxlen, const char *ext);
int BLI_ensure_extension(char *path, size_t maxlen, const char *ext);
void BLI_uniquename(struct ListBase *list, void *vlink, const char defname[], char delim, short name_offs, short len);
int BLI_uniquename_cb(int (*unique_check)(void *, const char *), void *arg, const char defname[], char delim, char *name, short name_len);
void BLI_uniquename(struct ListBase *list, void *vlink, const char * defname, char delim, short name_offs, short len);
bool BLI_uniquename_cb(bool (*unique_check)(void * arg, const char * name),
void *arg, const char * defname, char delim, char *name, short name_len);
void BLI_newname(char *name, int add);
int BLI_stringdec(const char *string, char *head, char *start, unsigned short *numlen);
void BLI_stringenc(char *string, const char *head, const char *tail, unsigned short numlen, int pic);
int BLI_split_name_num(char *left, int *nr, const char *name, const char delim);
int BLI_split_name_num(char *left, int *nr, const char *name, char delim);
void BLI_splitdirstring(char *di, char *fi);
/* make sure path separators conform to system one */
@@ -136,10 +137,10 @@ void BLI_cleanup_dir(const char *relabase, char *dir); /* same as above but adds
void BLI_cleanup_path(const char *relabase, char *dir); /* doesn't touch trailing slash */
/* go back one directory */
int BLI_parent_dir(char *path);
bool BLI_parent_dir(char *path);
/* return whether directory is root and thus has no parent dir */
int BLI_has_parent(char *path);
bool BLI_has_parent(char *path);
/**
* Blender's path code replacement function.
@@ -153,13 +154,13 @@ int BLI_has_parent(char *path);
* \a framenum The framenumber to replace the frame code with.
* \retval Returns true if the path was relative (started with "//").
*/
int BLI_path_abs(char *path, const char *basepath);
bool BLI_path_abs(char *path, const char *basepath);
int BLI_path_frame(char *path, int frame, int digits);
int BLI_path_frame_range(char *path, int sta, int end, int digits);
int BLI_path_cwd(char *path);
void BLI_path_rel(char *file, const char *relfile);
int BLI_path_is_rel(const char *path);
bool BLI_path_is_rel(const char *path);
#ifdef WIN32
# define BLI_path_cmp BLI_strcasecmp

12
source/blender/blenlib/intern/BLI_ghash.c
View File

@@ -120,7 +120,7 @@ void *BLI_ghash_lookup(GHash *gh, const void *key)
return NULL;
}
int BLI_ghash_remove(GHash *gh, void *key, GHashKeyFreeFP keyfreefp, GHashValFreeFP valfreefp)
bool BLI_ghash_remove(GHash *gh, void *key, GHashKeyFreeFP keyfreefp, GHashValFreeFP valfreefp)
{
unsigned int hash = gh->hashfp(key) % gh->nbuckets;
Entry *e;
@@ -140,12 +140,12 @@ int BLI_ghash_remove(GHash *gh, void *key, GHashKeyFreeFP keyfreefp, GHashValFre
else gh->buckets[hash] = n;
gh->nentries--;
return 1;
return true;
}
p = e;
}
return 0;
return false;
}
/* same as above but return the value,
@@ -178,16 +178,16 @@ void *BLI_ghash_pop(GHash *gh, void *key, GHashKeyFreeFP keyfreefp)
return NULL;
}
int BLI_ghash_haskey(GHash *gh, const void *key)
bool BLI_ghash_haskey(GHash *gh, const void *key)
{
unsigned int hash = gh->hashfp(key) % gh->nbuckets;
Entry *e;
for (e = gh->buckets[hash]; e; e = e->next)
if (gh->cmpfp(key, e->key) == 0)
return 1;
return true;
return 0;
return false;
}
void BLI_ghash_free(GHash *gh, GHashKeyFreeFP keyfreefp, GHashValFreeFP valfreefp)

5
source/blender/blenlib/intern/fileops.c
View File

@@ -806,7 +806,8 @@ static char *check_destination(const char *file, const char *to)
if (!stat(to, &st)) {
if (S_ISDIR(st.st_mode)) {
char *str, *filename, *path;
char *str, *path;
const char *filename;
size_t len = 0;
str = strip_last_slash(file);
@@ -875,7 +876,7 @@ void BLI_dir_create_recursive(const char *dirname)
BLI_strncpy(tmp, dirname, size);
lslash = BLI_last_slash(tmp);
lslash = (char *)BLI_last_slash(tmp);
if (lslash) {
/* Split about the last slash and recurse */
*lslash = 0;

218
source/blender/blenlib/intern/path_util.c
View File

@@ -88,34 +88,44 @@ static char *blender_version_decimal(const int ver);
/* implementation */
/**
* Looks for a sequence of decimal digits in string, preceding any filename extension,
* returning the integer value if found, or 0 if not.
*
* \param string String to scan.
* \param head Optional area to return copy of part of string prior to digits, or before dot if no digits.
* \param tail Optional area to return copy of part of string following digits, or from dot if no digits.
* \param numlen Optional to return number of digits found.
*/
int BLI_stringdec(const char *string, char *head, char *tail, unsigned short *numlen)
{
unsigned short len, len2, lenlslash = 0, nums = 0, nume = 0;
short i, found = 0;
char *lslash = BLI_last_slash(string);
len2 = len = strlen(string);
if (lslash)
lenlslash = (int)(lslash - string);
unsigned short nums = 0, nume = 0;
short i;
bool found_digit = false;
const char * const lslash = BLI_last_slash(string);
const unsigned short string_len = strlen(string);
const unsigned short lslash_len = lslash != NULL ? (int)(lslash - string) : 0;
unsigned short name_end = string_len;
while (len > lenlslash && string[--len] != '.') {}
if (len == lenlslash && string[len] != '.') len = len2;
while (name_end > lslash_len && string[--name_end] != '.') {} /* name ends at dot if present */
if (name_end == lslash_len && string[name_end] != '.') name_end = string_len;
for (i = len - 1; i >= lenlslash; i--) {
for (i = name_end - 1; i >= lslash_len; i--) {
if (isdigit(string[i])) {
if (found) {
if (found_digit) {
nums = i;
}
else {
nume = i;
nums = i;
found = 1;
found_digit = true;
}
}
else {
if (found) break;
if (found_digit) break;
}
}
if (found) {
if (found_digit) {
if (tail) strcpy(tail, &string[nume + 1]);
if (head) {
strcpy(head, string);
@@ -124,16 +134,20 @@ int BLI_stringdec(const char *string, char *head, char *tail, unsigned short *nu
if (numlen) *numlen = nume - nums + 1;
return ((int)atoi(&(string[nums])));
}
if (tail) strcpy(tail, string + len);
if (tail) strcpy(tail, string + name_end);
if (head) {
strncpy(head, string, len);
head[len] = '\0';
strncpy(head, string, name_end);
head[name_end] = '\0';
}
if (numlen) *numlen = 0;
return 0;
}
/**
* Returns in area pointed to by string a string of the form "<head><pic><tail>", where pic
* is formatted as numlen digits with leading zeroes.
*/
void BLI_stringenc(char *string, const char *head, const char *tail, unsigned short numlen, int pic)
{
char fmtstr[16] = "";
@@ -142,8 +156,19 @@ void BLI_stringenc(char *string, const char *head, const char *tail, unsigned sh
sprintf(string, fmtstr, head, pic, tail);
}
/* Foo.001 -> "Foo", 1
* Returns the length of "Foo" */
/**
* Looks for a numeric suffix preceded by delim character on the end of
* name, puts preceding part into *left and value of suffix into *nr.
* Returns the length of *left.
*
* Foo.001 -> "Foo", 1
* Returns the length of "Foo"
*
* \param left Where to return copy of part preceding delim
* \param nr Where to return value of numeric suffix
* \param name String to split
* \param delim Delimiter character
*/
int BLI_split_name_num(char *left, int *nr, const char *name, const char delim)
{
int a;
@@ -163,6 +188,7 @@ int BLI_split_name_num(char *left, int *nr, const char *name, const char delim)
*nr = 0;
return a;
}
/* non-numeric suffix--give up */
if (isdigit(name[a]) == 0) break;
left[a] = 0;
@@ -174,6 +200,9 @@ int BLI_split_name_num(char *left, int *nr, const char *name, const char delim)
return a;
}
/**
* Looks for a string of digits within name (using BLI_stringdec) and adjusts it by add.
*/
void BLI_newname(char *name, int add)
{
char head[UNIQUE_NAME_MAX], tail[UNIQUE_NAME_MAX];
@@ -196,9 +225,20 @@ void BLI_newname(char *name, int add)
BLI_stringenc(name, head, tail, digits, pic);
}
int BLI_uniquename_cb(int (*unique_check)(void *, const char *), void *arg, const char defname[], char delim, char *name, short name_len)
/**
* Ensures name is unique (according to criteria specified by caller in unique_check callback),
* incrementing its numeric suffix as necessary. Returns true if name had to be adjusted.
*
* \param unique_check Return true iff name is not unique
* \param arg Additional arg to unique_check--meaning is up to caller
* \param defname To initialize name if latter is empty
* \param delim Delimits numeric suffix in name
* \param name Name to be ensured unique
* \param name_len Maximum length of name area
* \return true if there if the name was changed
*/
bool BLI_uniquename_cb(bool (*unique_check)(void * arg, const char *name),
void *arg, const char *defname, char delim, char *name, short name_len)
{
if (name[0] == '\0') {
BLI_strncpy(name, defname, name_len);
@@ -211,7 +251,7 @@ int BLI_uniquename_cb(int (*unique_check)(void *, const char *), void *arg, cons
int number;
int len = BLI_split_name_num(left, &number, name, delim);
do {
int numlen = BLI_snprintf(numstr, sizeof(numstr), "%c%03d", delim, ++number);
const int numlen = BLI_snprintf(numstr, sizeof(numstr), "%c%03d", delim, ++number);
/* highly unlikely the string only has enough room for the number
* but support anyway */
@@ -229,10 +269,10 @@ int BLI_uniquename_cb(int (*unique_check)(void *, const char *), void *arg, cons
BLI_strncpy(name, tempname, name_len);
return 1;
return true;
}
return 0;
return false;
}
/* little helper macro for BLI_uniquename */
@@ -250,28 +290,39 @@ int BLI_uniquename_cb(int (*unique_check)(void *, const char *), void *arg, cons
* defname: the name that should be used by default if none is specified already
* delim: the character which acts as a delimiter between parts of the name
*/
static int uniquename_find_dupe(ListBase *list, void *vlink, const char *name, short name_offs)
static bool uniquename_find_dupe(ListBase *list, void *vlink, const char *name, short name_offs)
{
Link *link;
for (link = list->first; link; link = link->next) {
if (link != vlink) {
if (!strcmp(GIVE_STRADDR(link, name_offs), name)) {
return 1;
return true;
}
}
}
return 0;
return false;
}
static int uniquename_unique_check(void *arg, const char *name)
static bool uniquename_unique_check(void *arg, const char *name)
{
struct {ListBase *lb; void *vlink; short name_offs; } *data = arg;
return uniquename_find_dupe(data->lb, data->vlink, name, data->name_offs);
}
void BLI_uniquename(ListBase *list, void *vlink, const char defname[], char delim, short name_offs, short name_len)
/**
* Ensures that the specified block has a unique name within the containing list,
* incrementing its numeric suffix as necessary.
*
* \param list List containing the block
* \param vlink The block to check the name for
* \param defname To initialize block name if latter is empty
* \param delim Delimits numeric suffix in name
* \param name_offs Offset of name within block structure
* \param name_len Maximum length of name area
*/
void BLI_uniquename(ListBase *list, void *vlink, const char *defname, char delim, short name_offs, short name_len)
{
struct {ListBase *lb; void *vlink; short name_offs; } data;
data.lb = list;
@@ -410,14 +461,18 @@ void BLI_cleanup_file(const char *relabase, char *dir)
BLI_del_slash(dir);
}
int BLI_path_is_rel(const char *path)
/**
* Does path begin with the special "//" prefix that Blender uses to indicate
* a path relative to the .blend file.
*/
bool BLI_path_is_rel(const char *path)
{
return path[0] == '/' && path[1] == '/';
}
void BLI_path_rel(char *file, const char *relfile)
{
char *lslash;
const char *lslash;
char temp[FILE_MAX];
char res[FILE_MAX];
@@ -519,7 +574,11 @@ void BLI_path_rel(char *file, const char *relfile)
}
}
int BLI_has_parent(char *path)
/**
* Cleans path and makes sure it ends with a slash, and returns true iff
* it has more than one other path separator in it.
*/
bool BLI_has_parent(char *path)
{
int len;
int slashes = 0;
@@ -534,25 +593,34 @@ int BLI_has_parent(char *path)
return slashes > 1;
}
int BLI_parent_dir(char *path)
/**
* Replaces path with the path of its parent directory, returning true iff
* it was able to find a parent directory within the pathname.
*/
bool BLI_parent_dir(char *path)
{
static char parent_dir[] = {'.', '.', SEP, '\0'}; /* "../" or "..\\" */
char tmp[FILE_MAX + 4];
BLI_strncpy(tmp, path, sizeof(tmp) - 4);
BLI_add_slash(tmp);
strcat(tmp, parent_dir);
BLI_cleanup_dir(NULL, tmp);
BLI_cleanup_dir(NULL, tmp); /* does all the work of normalizing the path for us */
if (!BLI_testextensie(tmp, parent_dir)) {
BLI_strncpy(path, tmp, sizeof(tmp));
return 1;
return true;
}
else {
return 0;
return false;
}
}
static int stringframe_chars(char *path, int *char_start, int *char_end)
/**
* Looks for a sequence of "#" characters in the last slash-separated component of *path,
* returning the indexes of the first and one past the last character in the sequence in
* *char_start and *char_end respectively. Returns true iff such a sequence was found.
*/
static bool stringframe_chars(const char *path, int *char_start, int *char_end)
{
int ch_sta, ch_end, i;
/* Insert current frame: file### -> file001 */
@@ -576,18 +644,22 @@ static int stringframe_chars(char *path, int *char_start, int *char_end)
if (ch_end) {
*char_start = ch_sta;
*char_end = ch_end;
return 1;
return true;
}
else {
*char_start = -1;
*char_end = -1;
return 0;
return false;
}
}
/**
* Ensure *path contains at least one "#" character in its last slash-separated
* component, appending one digits long if not.
*/
static void ensure_digits(char *path, int digits)
{
char *file = BLI_last_slash(path);
char *file = (char *)BLI_last_slash(path);
if (file == NULL)
file = path;
@@ -636,9 +708,14 @@ int BLI_path_frame_range(char *path, int sta, int end, int digits)
return 0;
}
int BLI_path_abs(char *path, const char *basepath)
/**
* If path begins with "//", strips that and replaces it with basepath directory. Also converts
* a drive-letter prefix to something more sensible if this is a non-drive-letter-based system.
* Returns true iff "//" prefix expansion was done.
*/
bool BLI_path_abs(char *path, const char *basepath)
{
int wasrelative = BLI_path_is_rel(path);
const bool wasrelative = BLI_path_is_rel(path);
char tmp[FILE_MAX];
char base[FILE_MAX];
#ifdef WIN32
@@ -696,21 +773,23 @@ int BLI_path_abs(char *path, const char *basepath)
/* Paths starting with // will get the blend file as their base,
* this isn't standard in any os but is used in blender all over the place */
if (wasrelative) {
char *lslash = BLI_last_slash(base);
const char * const lslash = BLI_last_slash(base);
if (lslash) {
int baselen = (int) (lslash - base) + 1;
const int baselen = (int) (lslash - base) + 1; /* length up to and including last "/" */
/* use path for temp storage here, we copy back over it right away */
BLI_strncpy(path, tmp + 2, FILE_MAX);
BLI_strncpy(path, tmp + 2, FILE_MAX); /* strip "//" */
memcpy(tmp, base, baselen);
BLI_strncpy(tmp + baselen, path, sizeof(tmp) - baselen);
BLI_strncpy(path, tmp, FILE_MAX);
memcpy(tmp, base, baselen); /* prefix with base up to last "/" */
BLI_strncpy(tmp + baselen, path, sizeof(tmp) - baselen); /* append path after "//" */
BLI_strncpy(path, tmp, FILE_MAX); /* return as result */
}
else {
/* base doesn't seem to be a directory--ignore it and just strip "//" prefix on path */
BLI_strncpy(path, tmp + 2, FILE_MAX);
}
}
else {
/* base ignored */
BLI_strncpy(path, tmp, FILE_MAX);
}
@@ -776,7 +855,7 @@ int BLI_path_cwd(char *path)
/* 'di's filename component is moved into 'fi', di is made a dir path */
void BLI_splitdirstring(char *di, char *fi)
{
char *lslash = BLI_last_slash(di);
char *lslash = (char *)BLI_last_slash(di);
if (lslash) {
BLI_strncpy(fi, lslash + 1, FILE_MAXFILE);
@@ -1146,7 +1225,7 @@ char *BLI_get_folder_create(int folder_id, const char *subfolder)
return path;
}
char *BLI_get_folder_version(const int id, const int ver, const int do_check)
char *BLI_get_folder_version(const int id, const int ver, const bool do_check)
{
static char path[FILE_MAX] = "";
int ok;
@@ -1310,7 +1389,7 @@ void BLI_make_file_string(const char *relabase, char *string, const char *dir,
/* Get the file name, chop everything past the last slash (ie. the filename) */
strcpy(string, relabase);
lslash = BLI_last_slash(string);
lslash = (char *)BLI_last_slash(string);
if (lslash) *(lslash + 1) = 0;
dir += 2; /* Skip over the relative reference */
@@ -1473,7 +1552,7 @@ int BLI_ensure_extension(char *path, size_t maxlen, const char *ext)
* */
void BLI_split_dirfile(const char *string, char *dir, char *file, const size_t dirlen, const size_t filelen)
{
char *lslash_str = BLI_last_slash(string);
const char *lslash_str = BLI_last_slash(string);
size_t lslash = lslash_str ? (size_t)(lslash_str - string) + 1 : 0;
if (dir) {
@@ -1538,9 +1617,9 @@ void BLI_join_dirfile(char *dst, const size_t maxlen, const char *dir, const cha
}
/* like pythons os.path.basename( ) */
char *BLI_path_basename(char *path)
const char *BLI_path_basename(const char *path)
{
char *filename = BLI_last_slash(path);
const char * const filename = BLI_last_slash(path);
return filename ? filename + 1 : path;
}
@@ -1651,12 +1730,13 @@ int BLI_rebase_path(char *abs, size_t abs_len, char *rel, size_t rel_len, const
return BLI_REBASE_OK;
}
char *BLI_first_slash(char *string)
/**
* Returns pointer to the leftmost path separator in string. Not actually used anywhere.
*/
const char *BLI_first_slash(const char *string)
{
char *ffslash, *fbslash;
ffslash = strchr(string, '/');
fbslash = strchr(string, '\\');
char * const ffslash = strchr(string, '/');
char * const fbslash = strchr(string, '\\');
if (!ffslash) return fbslash;
else if (!fbslash) return ffslash;
@@ -1665,12 +1745,13 @@ char *BLI_first_slash(char *string)
else return fbslash;
}
char *BLI_last_slash(const char *string)
/**
* Returns pointer to the rightmost path separator in string.
*/
const char *BLI_last_slash(const char *string)
{
char *lfslash, *lbslash;
lfslash = strrchr(string, '/');
lbslash = strrchr(string, '\\');
const char * const lfslash = strrchr(string, '/');
const char * const lbslash = strrchr(string, '\\');
if (!lfslash) return lbslash;
else if (!lbslash) return lfslash;
@@ -1679,7 +1760,10 @@ char *BLI_last_slash(const char *string)
else return lfslash;
}
/* adds a slash if there isn't one there already */
/**
* Appends a slash to string if there isn't one there already.
* Returns the new length of the string.
*/
int BLI_add_slash(char *string)
{
int len = strlen(string);
@@ -1691,7 +1775,9 @@ int BLI_add_slash(char *string)
return len;
}
/* removes a slash if there is one */
/**
* Removes the last slash and everything after it to the end of string, if there is one.
*/
void BLI_del_slash(char *string)
{
int len = strlen(string);

6
source/blender/blenloader/intern/readfile.c
View File

@@ -1175,7 +1175,7 @@ int BLO_is_a_library(const char *path, char *dir, char *group)
dir[len - 1] = '\0';
/* Find the last slash */
fd = BLI_last_slash(dir);
fd = (char *)BLI_last_slash(dir);
if (fd == NULL) return 0;
*fd = 0;
@@ -1184,10 +1184,10 @@ int BLO_is_a_library(const char *path, char *dir, char *group)
*fd = '/'; /* put back the removed slash separating the dir and the .blend file name */
}
else {
char *gp = fd + 1; // in case we have a .blend file, gp points to the group
const char * const gp = fd + 1; // in case we have a .blend file, gp points to the group
/* Find the last slash */
fd = BLI_last_slash(dir);
fd = (char *)BLI_last_slash(dir);
if (!fd || !BLO_has_bfile_extension(fd+1)) return 0;
/* now we know that we are in a blend file and it is safe to

2
source/blender/bmesh/intern/bmesh_log.c
View File

@@ -20,11 +20,11 @@
#include "MEM_guardedalloc.h"
#include "BLI_utildefines.h"
#include "BLI_ghash.h"
#include "BLI_listbase.h"
#include "BLI_math.h"
#include "BLI_mempool.h"
#include "BLI_utildefines.h"
#include "BKE_customdata.h"

4
source/blender/bmesh/intern/bmesh_operator_api_inline.h
View File

@@ -120,13 +120,13 @@ BLI_INLINE void BMO_slot_map_empty_insert(BMOperator *op, BMOpSlot *slot,
BMO_slot_map_insert(op, slot, element, NULL, 0);
}
BLI_INLINE int BMO_slot_map_contains(BMOpSlot *slot, const void *element)
BLI_INLINE bool BMO_slot_map_contains(BMOpSlot *slot, const void *element)
{
BLI_assert(slot->slot_type == BMO_OP_SLOT_MAPPING);
/* sanity check */
if (UNLIKELY(slot->data.ghash == NULL)) {
return 0;
return false;
}
return BLI_ghash_haskey(slot->data.ghash, element);

2
source/blender/bmesh/operators/bmo_hull.c
View File

@@ -28,11 +28,11 @@
#include "MEM_guardedalloc.h"
#include "BLI_utildefines.h"
#include "BLI_array.h"
#include "BLI_ghash.h"
#include "BLI_listbase.h"
#include "BLI_math.h"
#include "BLI_utildefines.h"
#include "Bullet-C-Api.h"

4
source/blender/editors/armature/armature_naming.c
View File

@@ -72,7 +72,7 @@ EditBone *editbone_name_exists(ListBase *edbo, const char *name)
}
/* note: there's a unique_bone_name() too! */
static int editbone_unique_check(void *arg, const char *name)
static bool editbone_unique_check(void *arg, const char *name)
{
struct {ListBase *lb; void *bone; } *data = arg;
EditBone *dupli = editbone_name_exists(data->lb, name);
@@ -91,7 +91,7 @@ void unique_editbone_name(ListBase *edbo, char *name, EditBone *bone)
/* ************************************************** */
/* Bone Renaming - API */
static int bone_unique_check(void *arg, const char *name)
static bool bone_unique_check(void *arg, const char *name)
{
return BKE_armature_find_bone_name((bArmature *)arg, name) != NULL;
}

2
source/blender/editors/object/object_add.c
View File

@@ -49,11 +49,11 @@
#include "DNA_vfont_types.h"
#include "DNA_actuator_types.h"
#include "BLI_utildefines.h"
#include "BLI_ghash.h"
#include "BLI_listbase.h"
#include "BLI_math.h"
#include "BLI_string.h"
#include "BLI_utildefines.h"
#include "BKE_anim.h"
#include "BKE_animsys.h"

1
source/blender/editors/sculpt_paint/paint_mask.c
View File

@@ -38,6 +38,7 @@
#include "DNA_meshdata_types.h"
#include "DNA_object_types.h"
#include "BLI_utildefines.h"
#include "BKE_pbvh.h"
#include "BKE_ccg.h"
#include "BKE_context.h"

2
source/blender/editors/space_buttons/buttons_ops.c
View File

@@ -189,7 +189,7 @@ static int file_browse_invoke(bContext *C, wmOperator *op, wmEvent *event)
PointerRNA props_ptr;
if (event->alt) {
char *lslash = BLI_last_slash(str);
char *lslash = (char *)BLI_last_slash(str);
if (lslash)
*lslash = '\0';
}

2
source/blender/editors/space_file/filelist.c
View File

@@ -1033,7 +1033,7 @@ static int groupname_to_code(const char *group)
char *lslash;
BLI_strncpy(buf, group, sizeof(buf));
lslash = BLI_last_slash(buf);
lslash = (char *)BLI_last_slash(buf);
if (lslash)
lslash[0] = '\0';

2
source/blender/editors/space_image/image_buttons.c
View File

@@ -114,7 +114,7 @@ static void image_info(Scene *scene, ImageUser *iuser, Image *ima, ImBuf *ibuf,
ofs += sprintf(str + ofs, IFACE_(" + Z"));
if (ima->source == IMA_SRC_SEQUENCE) {
char *file = BLI_last_slash(ibuf->name);
const char *file = BLI_last_slash(ibuf->name);
if (file == NULL) file = ibuf->name;
else file++;
ofs += sprintf(str + ofs, ", %s", file);

2
source/blender/editors/transform/transform_orientations.c
View File

@@ -89,7 +89,7 @@ static TransformOrientation *findOrientationName(ListBase *lb, const char *name)
return NULL;
}
static int uniqueOrientationNameCheck(void *arg, const char *name)
static bool uniqueOrientationNameCheck(void *arg, const char *name)
{
return findOrientationName((ListBase *)arg, name) != NULL;
}

1
source/blender/editors/uvedit/uvedit_smart_stitch.c
View File

@@ -41,6 +41,7 @@
#include "DNA_meshdata_types.h"
#include "DNA_scene_types.h"
#include "BLI_utildefines.h"
#include "BLI_ghash.h"
#include "BLI_math.h"
#include "BLI_math_vector.h"

12
source/blender/nodes/composite/nodes/node_composite_outputFile.c
View File

@@ -45,7 +45,7 @@
/* **************** OUTPUT FILE ******************** */
/* find unique path */
static int unique_path_unique_check(void *arg, const char *name)
static bool unique_path_unique_check(void *arg, const char *name)
{
struct {ListBase *lb; bNodeSocket *sock;} *data= arg;
bNodeSocket *sock;
@@ -53,10 +53,10 @@ static int unique_path_unique_check(void *arg, const char *name)
if (sock != data->sock) {
NodeImageMultiFileSocket *sockdata = sock->storage;
if (strcmp(sockdata->path, name)==0)
return 1;
return true;
}
}
return 0;
return false;
}
void ntreeCompositOutputFileUniquePath(ListBase *list, bNodeSocket *sock, const char defname[], char delim)
{
@@ -74,7 +74,7 @@ void ntreeCompositOutputFileUniquePath(ListBase *list, bNodeSocket *sock, const
}
/* find unique EXR layer */
static int unique_layer_unique_check(void *arg, const char *name)
static bool unique_layer_unique_check(void *arg, const char *name)
{
struct {ListBase *lb; bNodeSocket *sock;} *data= arg;
bNodeSocket *sock;
@@ -82,10 +82,10 @@ static int unique_layer_unique_check(void *arg, const char *name)
if (sock != data->sock) {
NodeImageMultiFileSocket *sockdata = sock->storage;
if (strcmp(sockdata->layer, name)==0)
return 1;
return true;
}
}
return 0;
return false;
}
void ntreeCompositOutputFileUniqueLayer(ListBase *list, bNodeSocket *sock, const char defname[], char delim)
{

2
source/blender/python/intern/bpy_app_translations.c
View File

@@ -32,9 +32,9 @@
/* XXX Why bloody hell isn't that included in Python.h???? */
#include <structmember.h>
#include "BLI_utildefines.h"
#include "BLI_string.h"
#include "BLI_ghash.h"
#include "BLI_utildefines.h"
#include "BPY_extern.h"
#include "bpy_app_translations.h"

2
source/blender/windowmanager/intern/wm_operators.c
View File

@@ -2319,7 +2319,7 @@ static void WM_OT_recover_auto_save(wmOperatorType *ot)
static void untitled(char *filepath)
{
if (G.save_over == 0 && strlen(filepath) < FILE_MAX - 16) {
char *c = BLI_last_slash(filepath);
char *c = (char *)BLI_last_slash(filepath);
if (c)
strcpy(&c[1], "untitled.blend");