MyFavMirrors
/
owntone-server
mirror of https://github.com/owntone/owntone-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename E_INF to E_INFO

This commit is contained in:
Julien BLACHE 2009-05-08 17:52:56 +02:00
parent b6f23a8273
commit d384f3c395
8 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/conffile.c
View File

@ -81,7 +81,7 @@ cb_loglevel(cfg_t *cfg, cfg_opt_t *opt, const char *value, void *result)
else if (strcasecmp(value, "warning") == 0) else if (strcasecmp(value, "warning") == 0)
*(long int *)result = E_WARN; *(long int *)result = E_WARN;
else if (strcasecmp(value, "info") == 0) else if (strcasecmp(value, "info") == 0)
*(long int *)result = E_INF; *(long int *)result = E_INFO;
else if (strcasecmp(value, "debug") == 0) else if (strcasecmp(value, "debug") == 0)
*(long int *)result = E_DBG; *(long int *)result = E_DBG;
else if (strcasecmp(value, "spam") == 0) else if (strcasecmp(value, "spam") == 0)
@ -253,7 +253,7 @@ conffile_load(char *file)
nlib = cfg_size(cfg, "library"); nlib = cfg_size(cfg, "library");
DPRINTF(E_INF, L_CONF, "%d music libraries configured\n", nlib); DPRINTF(E_INFO, L_CONF, "%d music libraries configured\n", nlib);
libports = (int *)malloc(nlib * sizeof(int)); libports = (int *)malloc(nlib * sizeof(int));
memset(libports, 0, (nlib * sizeof(int))); memset(libports, 0, (nlib * sizeof(int)));

2
src/db-sql.c
View File

@ -1628,7 +1628,7 @@ int db_sql_get_count(char **pe, int *count, CountType_t type) {
int db_sql_playcount_increment(char **pe, int id) { int db_sql_playcount_increment(char **pe, int id) {
time_t now = time(NULL); time_t now = time(NULL);
return db_sql_exec_fn(pe,E_INF,"update songs set play_count=play_count + 1" return db_sql_exec_fn(pe,E_INFO,"update songs set play_count=play_count + 1"
", time_played=%d where id=%d",now,id); ", time_played=%d where id=%d",now,id);
} }

2
src/filescanner.c
View File

@ -352,7 +352,7 @@ defer_playlist(char *path)
pl->next = playlists; pl->next = playlists;
playlists = pl; playlists = pl;
DPRINTF(E_INF, L_SCAN, "Deferred playlist %s\n", path); DPRINTF(E_INFO, L_SCAN, "Deferred playlist %s\n", path);
} }
/* Thread: scan */ /* Thread: scan */

6
src/filescanner_m3u.c
View File

@ -57,7 +57,7 @@ scan_m3u_playlist(char *file)
int pl_id; int pl_id;
int ret; int ret;
DPRINTF(E_INF, L_SCAN, "Processing static playlist: %s\n", file); DPRINTF(E_INFO, L_SCAN, "Processing static playlist: %s\n", file);
ret = stat(file, &sb); ret = stat(file, &sb);
if (ret < 0) if (ret < 0)
@ -142,7 +142,7 @@ scan_m3u_playlist(char *file)
return; return;
} }
DPRINTF(E_INF, L_SCAN, "Added playlist as id %d\n", pl_id); DPRINTF(E_INFO, L_SCAN, "Added playlist as id %d\n", pl_id);
while (fgets(buf, sizeof(buf), fp) != NULL) while (fgets(buf, sizeof(buf), fp) != NULL)
{ {
@ -222,5 +222,5 @@ scan_m3u_playlist(char *file)
fclose(fp); fclose(fp);
DPRINTF(E_INF, L_SCAN, "Done processing playlist\n"); DPRINTF(E_INFO, L_SCAN, "Done processing playlist\n");
} }

8
src/httpd.c
View File

@ -335,7 +335,7 @@ httpd_stream_file(struct evhttp_request *req, int id)
if (transcode) if (transcode)
{ {
DPRINTF(E_INF, L_HTTPD, "Preparing to transcode %s\n", mfi->path); DPRINTF(E_INFO, L_HTTPD, "Preparing to transcode %s\n", mfi->path);
stream_cb = stream_chunk_xcode_cb; stream_cb = stream_chunk_xcode_cb;
st->fd = -1; st->fd = -1;
@ -358,7 +358,7 @@ httpd_stream_file(struct evhttp_request *req, int id)
else else
{ {
/* Stream the raw file */ /* Stream the raw file */
DPRINTF(E_INF, L_HTTPD, "Preparing to stream %s\n", mfi->path); DPRINTF(E_INFO, L_HTTPD, "Preparing to stream %s\n", mfi->path);
stream_cb = stream_chunk_raw_cb; stream_cb = stream_chunk_raw_cb;
@ -492,7 +492,7 @@ httpd_stream_file(struct evhttp_request *req, int id)
req->fail_cb = stream_fail_cb; req->fail_cb = stream_fail_cb;
req->fail_cb_arg = st; req->fail_cb_arg = st;
DPRINTF(E_INF, L_HTTPD, "Kicking off streaming for %s\n", mfi->path); DPRINTF(E_INFO, L_HTTPD, "Kicking off streaming for %s\n", mfi->path);
db_dispose_item(mfi); db_dispose_item(mfi);
} }
@ -1005,7 +1005,7 @@ httpd_init(void)
/* evhttp doesn't support IPv6 yet, so this is expected to fail */ /* evhttp doesn't support IPv6 yet, so this is expected to fail */
bindv6 = evhttp_bind_socket(evhttpd, "::", port); bindv6 = evhttp_bind_socket(evhttpd, "::", port);
if (bindv6 < 0) if (bindv6 < 0)
DPRINTF(E_INF, L_HTTPD, "Could not bind IN6ADDR_ANY:%d (that's OK)\n", port); DPRINTF(E_INFO, L_HTTPD, "Could not bind IN6ADDR_ANY:%d (that's OK)\n", port);
ret = evhttp_bind_socket(evhttpd, "0.0.0.0", port); ret = evhttp_bind_socket(evhttpd, "0.0.0.0", port);
if (ret < 0) if (ret < 0)

3
src/logger.h
View File

@ -28,9 +28,6 @@
#define E_DBG 4 #define E_DBG 4
#define E_SPAM 5 #define E_SPAM 5
/* Will go away */
#define E_INF E_INFO
void void
DPRINTF(int severity, int domain, char *fmt, ...); DPRINTF(int severity, int domain, char *fmt, ...);

16
src/scan-wma.c
View File

@ -866,13 +866,13 @@ char *wma_utf16toutf8(unsigned char *utf16, int len) {
src += 2; src += 2;
if((w1 & 0xFC00) == 0xD800) { /* could be surrogate pair */ if((w1 & 0xFC00) == 0xD800) { /* could be surrogate pair */
if(src+2 > utf16+len) { if(src+2 > utf16+len) {
DPRINTF(E_INF,L_SCAN,"Invalid utf-16 in file\n"); DPRINTF(E_INFO,L_SCAN,"Invalid utf-16 in file\n");
free(utf8); free(utf8);
return NULL; return NULL;
} }
w2 = src[3] << 8 | src[2]; w2 = src[3] << 8 | src[2];
if((w2 & 0xFC00) != 0xDC00) { if((w2 & 0xFC00) != 0xDC00) {
DPRINTF(E_INF,L_SCAN,"Invalid utf-16 in file\n"); DPRINTF(E_INFO,L_SCAN,"Invalid utf-16 in file\n");
free(utf8); free(utf8);
return NULL; return NULL;
} }
@ -996,7 +996,7 @@ int scan_get_wmainfo(char *filename, MP3FILE *pmp3) {
fd = open(filename, O_RDONLY); fd = open(filename, O_RDONLY);
if (fd < 0) { if (fd < 0) {
DPRINTF(E_INF,L_SCAN,"Error opening WMA file (%s): %s\n",filename, DPRINTF(E_INFO,L_SCAN,"Error opening WMA file (%s): %s\n",filename,
strerror(errno)); strerror(errno));
return FALSE; return FALSE;
} }
@ -1004,7 +1004,7 @@ int scan_get_wmainfo(char *filename, MP3FILE *pmp3) {
len = sizeof(hdr); len = sizeof(hdr);
ret = read(fd, &hdr, len); ret = read(fd, &hdr, len);
if((ret < 0) || (ret != len)) { if((ret < 0) || (ret != len)) {
DPRINTF(E_INF,L_SCAN,"Error reading from %s: %s\n",filename, DPRINTF(E_INFO,L_SCAN,"Error reading from %s: %s\n",filename,
strerror(errno)); strerror(errno));
close(fd); close(fd);
return FALSE; return FALSE;
@ -1012,7 +1012,7 @@ int scan_get_wmainfo(char *filename, MP3FILE *pmp3) {
pguid = wma_find_guid(hdr.objectid); pguid = wma_find_guid(hdr.objectid);
if(!pguid) { if(!pguid) {
DPRINTF(E_INF,L_SCAN,"Could not find header in %s\n",filename); DPRINTF(E_INFO,L_SCAN,"Could not find header in %s\n",filename);
close(fd); close(fd);
return FALSE; return FALSE;
} }
@ -1032,7 +1032,7 @@ int scan_get_wmainfo(char *filename, MP3FILE *pmp3) {
for(item=0; item < (int) hdr.objects; item++) { for(item=0; item < (int) hdr.objects; item++) {
if(!lseek(fd,offset,SEEK_SET)) { if(!lseek(fd,offset,SEEK_SET)) {
DPRINTF(E_INF,L_SCAN,"Error seeking in %s\n",filename); DPRINTF(E_INFO,L_SCAN,"Error seeking in %s\n",filename);
close(fd); close(fd);
return FALSE; return FALSE;
} }
@ -1040,7 +1040,7 @@ int scan_get_wmainfo(char *filename, MP3FILE *pmp3) {
len = sizeof(subhdr); len = sizeof(subhdr);
ret = read(fd, &subhdr, len); ret = read(fd, &subhdr, len);
if((ret < 0) || (ret != len)) { if((ret < 0) || (ret != len)) {
DPRINTF(E_INF,L_SCAN,"Error reading from %s: %s\n",filename, DPRINTF(E_INFO,L_SCAN,"Error reading from %s: %s\n",filename,
strerror(errno)); strerror(errno));
close(fd); close(fd);
return FALSE; return FALSE;
@ -1086,7 +1086,7 @@ int scan_get_wmainfo(char *filename, MP3FILE *pmp3) {
if(!res) { if(!res) {
DPRINTF(E_INF,L_SCAN,"Error reading meta info for file %s\n", DPRINTF(E_INFO,L_SCAN,"Error reading meta info for file %s\n",
filename); filename);
} else { } else {
DPRINTF(E_DBG,L_SCAN,"Successfully parsed file\n"); DPRINTF(E_DBG,L_SCAN,"Successfully parsed file\n");

2
src/smart-parser.c
View File

@ -635,7 +635,7 @@ int sp_scan(PARSETREE tree, int hint) {
if(is_qstr) { if(is_qstr) {
tree->current++; /* absorb it */ tree->current++; /* absorb it */
} else { } else {
DPRINTF(E_INF,L_PARSE,"Missing closing quotes\n"); DPRINTF(E_INFO,L_PARSE,"Missing closing quotes\n");
if(tree->token.token_id & 0x2000) { if(tree->token.token_id & 0x2000) {
free(tree->token.data.cvalue); free(tree->token.data.cvalue);
} }