storm/minidlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduce THISORNUL macro.

Browse Source
This commit is contained in:
Justin Maggard
2014-04-07 10:29:56 -07:00
parent e3792ad8da
commit 6e43ab3c06
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scanner.c
View File

@ -769,14 +769,14 @@ ScanDirectory(const char *dir, const char *parent, media_types dir_types)
if( (type == TYPE_DIR) && (access(full_path, R_OK|X_OK) == 0) )
{
char *parent_id;
insert_directory(name, full_path, BROWSEDIR_ID, (parent ? parent:""), i+startID);
xasprintf(&parent_id, "%s$%X", (parent ? parent:""), i+startID);
insert_directory(name, full_path, BROWSEDIR_ID, THISORNUL(parent), i+startID);
xasprintf(&parent_id, "%s$%X", THISORNUL(parent), i+startID);
ScanDirectory(full_path, parent_id, dir_types);
free(parent_id);
}
else if( type == TYPE_FILE && (access(full_path, R_OK) == 0) )
{
if( insert_file(name, full_path, (parent ? parent:""), i+startID) == 0 )
if( insert_file(name, full_path, THISORNUL(parent), i+startID) == 0 )
fileno++;
}
free(name);