MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-14 08:15:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

[cache] Minor changes so "const char *" path arguments are accepted

Browse Source
This commit is contained in:
ejurgensen 2020-02-19 23:01:43 +01:00
parent 2651a979fe
commit 9068c66dcd
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/cache.c
View File

@ -57,7 +57,8 @@ struct cache_arg
int is_remote; int is_remote;
int msec; int msec;
char *path; // artwork path const char *path; // artwork path
char *pathcopy; // copy of artwork path (for async operations)
int type; // individual or group artwork int type; // individual or group artwork
int64_t persistentid; int64_t persistentid;
int max_w; int max_w;
@ -903,7 +904,7 @@ cache_daap_listener_cb(short event_mask)
* after the cached timestamp. All cache entries for the given path are deleted, if the file was * after the cached timestamp. All cache entries for the given path are deleted, if the file was
* modified after the cached timestamp. * modified after the cached timestamp.
* *
* @param cmdarg->path the full path to the artwork file (could be an jpg/png image or a media file with embedded artwork) * @param cmdarg->pathcopy the full path to the artwork file (could be an jpg/png image or a media file with embedded artwork)
* @param cmdarg->mtime modified timestamp of the artwork file * @param cmdarg->mtime modified timestamp of the artwork file
* @return 0 if successful, -1 if an error occurred * @return 0 if successful, -1 if an error occurred
*/ */
@ -919,7 +920,7 @@ cache_artwork_ping_impl(void *arg, int *retval)
int ret; int ret;
cmdarg = arg; cmdarg = arg;
query = sqlite3_mprintf(Q_TMPL_PING, (int64_t)time(NULL), cmdarg->path, (int64_t)cmdarg->mtime); query = sqlite3_mprintf(Q_TMPL_PING, (int64_t)time(NULL), cmdarg->pathcopy, (int64_t)cmdarg->mtime);
DPRINTF(E_DBG, L_CACHE, "Running query '%s'\n", query); DPRINTF(E_DBG, L_CACHE, "Running query '%s'\n", query);
@ -934,7 +935,7 @@ cache_artwork_ping_impl(void *arg, int *retval)
if (cmdarg->del > 0) if (cmdarg->del > 0)
{ {
query = sqlite3_mprintf(Q_TMPL_DEL, cmdarg->path, (int64_t)cmdarg->mtime); query = sqlite3_mprintf(Q_TMPL_DEL, cmdarg->pathcopy, (int64_t)cmdarg->mtime);
DPRINTF(E_DBG, L_CACHE, "Running query '%s'\n", query); DPRINTF(E_DBG, L_CACHE, "Running query '%s'\n", query);
@ -948,14 +949,14 @@ cache_artwork_ping_impl(void *arg, int *retval)
} }
} }
free(cmdarg->path); free(cmdarg->pathcopy);
*retval = 0; *retval = 0;
return COMMAND_END; return COMMAND_END;
error_ping: error_ping:
sqlite3_free(errmsg); sqlite3_free(errmsg);
free(cmdarg->path); free(cmdarg->pathcopy);
*retval = -1; *retval = -1;
return COMMAND_END; return COMMAND_END;
@ -1415,7 +1416,7 @@ cache_artwork_ping(const char *path, time_t mtime, int del)
return; return;
} }
cmdarg->path = strdup(path); cmdarg->pathcopy = strdup(path);
cmdarg->mtime = mtime; cmdarg->mtime = mtime;
cmdarg->del = del; cmdarg->del = del;
@ -1429,7 +1430,7 @@ cache_artwork_ping(const char *path, time_t mtime, int del)
* @return 0 if successful, -1 if an error occurred * @return 0 if successful, -1 if an error occurred
*/ */
int int
cache_artwork_delete_by_path(char *path) cache_artwork_delete_by_path(const char *path)
{ {
struct cache_arg cmdarg; struct cache_arg cmdarg;
@ -1541,7 +1542,7 @@ cache_artwork_get(int type, int64_t persistentid, int max_w, int max_h, int *cac
* @return 0 if successful, -1 if an error occurred * @return 0 if successful, -1 if an error occurred
*/ */
int int
cache_artwork_stash(struct evbuffer *evbuf, char *path, int format) cache_artwork_stash(struct evbuffer *evbuf, const char *path, int format)
{ {
struct cache_arg cmdarg; struct cache_arg cmdarg;
@ -1564,7 +1565,7 @@ cache_artwork_stash(struct evbuffer *evbuf, char *path, int format)
* @return 0 if successful, -1 if an error occurred * @return 0 if successful, -1 if an error occurred
*/ */
int int
cache_artwork_read(struct evbuffer *evbuf, char *path, int *format) cache_artwork_read(struct evbuffer *evbuf, const char *path, int *format)
{ {
struct cache_arg cmdarg; struct cache_arg cmdarg;
int ret; int ret;

6
src/cache.h
View File

@ -31,7 +31,7 @@ void
cache_artwork_ping(const char *path, time_t mtime, int del); cache_artwork_ping(const char *path, time_t mtime, int del);
int int
cache_artwork_delete_by_path(char *path); cache_artwork_delete_by_path(const char *path);
int int
cache_artwork_purge_cruft(time_t ref); cache_artwork_purge_cruft(time_t ref);
@ -43,10 +43,10 @@ int
cache_artwork_get(int type, int64_t persistentid, int max_w, int max_h, int *cached, int *format, struct evbuffer *evbuf); cache_artwork_get(int type, int64_t persistentid, int max_w, int max_h, int *cached, int *format, struct evbuffer *evbuf);
int int
cache_artwork_stash(struct evbuffer *evbuf, char *path, int format); cache_artwork_stash(struct evbuffer *evbuf, const char *path, int format);
int int
cache_artwork_read(struct evbuffer *evbuf, char *path, int *format); cache_artwork_read(struct evbuffer *evbuf, const char *path, int *format);
/* ---------------------------- Cache API --------------------------- */ /* ---------------------------- Cache API --------------------------- */