MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-03-30 17:23:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow const char tags and handle null requests in dmap_common

Browse Source
This commit is contained in:
ejurgensen 2014-08-21 09:59:59 +02:00
parent 39b9c4fc33
commit 7623de1ac4
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/dmap_common.c
View File

@ -43,7 +43,7 @@ dmap_get_fields_table(int *nfields)
void void
dmap_add_container(struct evbuffer *evbuf, char *tag, int len) dmap_add_container(struct evbuffer *evbuf, const char *tag, int len)
{ {
unsigned char buf[4]; unsigned char buf[4];
@ -59,7 +59,7 @@ dmap_add_container(struct evbuffer *evbuf, char *tag, int len)
} }
void void
dmap_add_long(struct evbuffer *evbuf, char *tag, int64_t val) dmap_add_long(struct evbuffer *evbuf, const char *tag, int64_t val)
{ {
unsigned char buf[12]; unsigned char buf[12];
@ -85,7 +85,7 @@ dmap_add_long(struct evbuffer *evbuf, char *tag, int64_t val)
} }
void void
dmap_add_int(struct evbuffer *evbuf, char *tag, int val) dmap_add_int(struct evbuffer *evbuf, const char *tag, int val)
{ {
unsigned char buf[8]; unsigned char buf[8];
@ -107,7 +107,7 @@ dmap_add_int(struct evbuffer *evbuf, char *tag, int val)
} }
void void
dmap_add_short(struct evbuffer *evbuf, char *tag, short val) dmap_add_short(struct evbuffer *evbuf, const char *tag, short val)
{ {
unsigned char buf[6]; unsigned char buf[6];
@ -127,7 +127,7 @@ dmap_add_short(struct evbuffer *evbuf, char *tag, short val)
} }
void void
dmap_add_char(struct evbuffer *evbuf, char *tag, char val) dmap_add_char(struct evbuffer *evbuf, const char *tag, char val)
{ {
unsigned char buf[5]; unsigned char buf[5];
@ -146,7 +146,7 @@ dmap_add_char(struct evbuffer *evbuf, char *tag, char val)
} }
void void
dmap_add_literal(struct evbuffer *evbuf, char *tag, char *str, int len) dmap_add_literal(struct evbuffer *evbuf, const char *tag, char *str, int len)
{ {
char buf[4]; char buf[4];
@ -179,7 +179,7 @@ dmap_add_raw_uint32(struct evbuffer *evbuf, uint32_t val)
} }
void void
dmap_add_string(struct evbuffer *evbuf, char *tag, const char *str) dmap_add_string(struct evbuffer *evbuf, const char *tag, const char *str)
{ {
unsigned char buf[4]; unsigned char buf[4];
int len; int len;
@ -341,12 +341,15 @@ dmap_add_field(struct evbuffer *evbuf, const struct dmap_field *df, char *strval
void void
dmap_send_error(struct evhttp_request *req, char *container, char *errmsg) dmap_send_error(struct evhttp_request *req, const char *container, const char *errmsg)
{ {
struct evbuffer *evbuf; struct evbuffer *evbuf;
int len; int len;
int ret; int ret;
if (!req)
return;
evbuf = evbuffer_new(); evbuf = evbuffer_new();
if (!evbuf) if (!evbuf)
{ {

16
src/dmap_common.h
View File

@ -54,35 +54,35 @@ dmap_find_field (register const char *str, register unsigned int len);
void void
dmap_add_container(struct evbuffer *evbuf, char *tag, int len); dmap_add_container(struct evbuffer *evbuf, const char *tag, int len);
void void
dmap_add_long(struct evbuffer *evbuf, char *tag, int64_t val); dmap_add_long(struct evbuffer *evbuf, const char *tag, int64_t val);
void void
dmap_add_int(struct evbuffer *evbuf, char *tag, int val); dmap_add_int(struct evbuffer *evbuf, const char *tag, int val);
void void
dmap_add_short(struct evbuffer *evbuf, char *tag, short val); dmap_add_short(struct evbuffer *evbuf, const char *tag, short val);
void void
dmap_add_char(struct evbuffer *evbuf, char *tag, char val); dmap_add_char(struct evbuffer *evbuf, const char *tag, char val);
void void
dmap_add_literal(struct evbuffer *evbuf, char *tag, char *str, int len); dmap_add_literal(struct evbuffer *evbuf, const char *tag, char *str, int len);
void void
dmap_add_raw_uint32(struct evbuffer *evbuf, uint32_t val); dmap_add_raw_uint32(struct evbuffer *evbuf, uint32_t val);
void void
dmap_add_string(struct evbuffer *evbuf, char *tag, const char *str); dmap_add_string(struct evbuffer *evbuf, const char *tag, const char *str);
void void
dmap_add_field(struct evbuffer *evbuf, const struct dmap_field *df, char *strval, int32_t intval); dmap_add_field(struct evbuffer *evbuf, const struct dmap_field *df, char *strval, int32_t intval);
void void
dmap_send_error(struct evhttp_request *req, char *container, char *errmsg); dmap_send_error(struct evhttp_request *req, const char *container, const char *errmsg);
int int