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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
minissdp.c
View File

@ -234,7 +234,7 @@ SendSSDPResponse(int s, struct sockaddr_in sockname, int st_no,
(runtime_vars.notify_interval<<1)+10, (runtime_vars.notify_interval<<1)+10,
tmstr, tmstr,
known_service_types[st_no], known_service_types[st_no],
(st_no>1?"1":""), (st_no > 1 ? "1" : ""),
uuidvalue, uuidvalue,
(st_no > 0 ? "::" : ""), (st_no > 0 ? "::" : ""),
(st_no > 0 ? known_service_types[st_no] : ""), (st_no > 0 ? known_service_types[st_no] : ""),

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) ) if( (type == TYPE_DIR) && (access(full_path, R_OK|X_OK) == 0) )
{ {
char *parent_id; char *parent_id;
insert_directory(name, full_path, BROWSEDIR_ID, (parent ? parent:""), i+startID); insert_directory(name, full_path, BROWSEDIR_ID, THISORNUL(parent), i+startID);
xasprintf(&parent_id, "%s$%X", (parent ? parent:""), i+startID); xasprintf(&parent_id, "%s$%X", THISORNUL(parent), i+startID);
ScanDirectory(full_path, parent_id, dir_types); ScanDirectory(full_path, parent_id, dir_types);
free(parent_id); free(parent_id);
} }
else if( type == TYPE_FILE && (access(full_path, R_OK) == 0) ) 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++; fileno++;
} }
free(name); free(name);

1
upnpglobalvars.h
View File

@ -73,6 +73,7 @@
#else #else
#define _(string) (string) #define _(string) (string)
#endif #endif
#define THISORNUL(s) (s ? s : "")
#ifndef PNPX #ifndef PNPX
#define PNPX 0 #define PNPX 0

4
upnpsoap.c
View File

@ -1267,7 +1267,7 @@ BrowseContentDirectory(struct upnphttp * h, const char * action)
sql = sqlite3_mprintf( SELECT_COLUMNS sql = sqlite3_mprintf( SELECT_COLUMNS
"from OBJECTS o left join DETAILS d on (d.ID = o.DETAIL_ID)" "from OBJECTS o left join DETAILS d on (d.ID = o.DETAIL_ID)"
" where PARENT_ID = '%q' %s limit %d, %d;", " where PARENT_ID = '%q' %s limit %d, %d;",
ObjectID, orderBy, StartingIndex, RequestedCount); ObjectID, THISORNUL(orderBy), StartingIndex, RequestedCount);
DPRINTF(E_DEBUG, L_HTTP, "Browse SQL: %s\n", sql); DPRINTF(E_DEBUG, L_HTTP, "Browse SQL: %s\n", sql);
ret = sqlite3_exec(db, sql, callback, (void *) &args, &zErrMsg); ret = sqlite3_exec(db, sql, callback, (void *) &args, &zErrMsg);
} }
@ -1787,7 +1787,7 @@ QueryStateVariable(struct upnphttp * h, const char * action)
} }
else else
{ {
DPRINTF(E_WARN, L_HTTP, "%s: Unknown: %s\n", action, var_name?var_name:""); DPRINTF(E_WARN, L_HTTP, "%s: Unknown: %s\n", action, THISORNUL(var_name));
SoapError(h, 404, "Invalid Var"); SoapError(h, 404, "Invalid Var");
} }