Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-11-26 15:20:29 +01:00
Code Issues Projects Releases Wiki Activity

2018-09-10 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Quadrupled the length of strings in 'struct rd_cart' in the
	'rivwebcapi' to accomodate UTF-8 characters.
This commit is contained in:
Fred Gleason
2018-09-10 12:21:25 -04:00
parent f13aa1e3ae
commit 5179ba9563
41 changed files with 284 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
apis/rivwebcapi/rivwebcapi/rd_addcart.c
View File

@@ -82,37 +82,37 @@ static void XMLCALL __AddCartElementEnd(void *data, const char *el)
}
if(strcasecmp(el,"groupName")==0) {
strlcpy(cart->cart_grp_name,xml_data->strbuf,11);
strlcpy(cart->cart_grp_name,xml_data->strbuf,41);
}
if(strcasecmp(el,"title")==0) {
strlcpy(cart->cart_title,xml_data->strbuf,256);
strlcpy(cart->cart_title,xml_data->strbuf,1021);
}
if(strcasecmp(el,"artist")==0) {
strlcpy(cart->cart_artist,xml_data->strbuf,256);
strlcpy(cart->cart_artist,xml_data->strbuf,1021);
}
if(strcasecmp(el,"album")==0) {
strlcpy(cart->cart_album,xml_data->strbuf,256);
strlcpy(cart->cart_album,xml_data->strbuf,1021);
}
if(strcasecmp(el,"year")==0) {
sscanf(xml_data->strbuf,"%d",&cart->cart_year);
}
if(strcasecmp(el,"label")==0) {
strlcpy(cart->cart_label,xml_data->strbuf,65);
strlcpy(cart->cart_label,xml_data->strbuf,257);
}
if(strcasecmp(el,"client")==0) {
strlcpy(cart->cart_client,xml_data->strbuf,65);
strlcpy(cart->cart_client,xml_data->strbuf,257);
}
if(strcasecmp(el,"agency")==0) {
strlcpy(cart->cart_agency,xml_data->strbuf,65);
strlcpy(cart->cart_agency,xml_data->strbuf,257);
}
if(strcasecmp(el,"publisher")==0) {
strlcpy(cart->cart_publisher,xml_data->strbuf,65);
strlcpy(cart->cart_publisher,xml_data->strbuf,257);
}
if(strcasecmp(el,"composer")==0) {
strlcpy(cart->cart_composer,xml_data->strbuf,65);
strlcpy(cart->cart_composer,xml_data->strbuf,257);
}
if(strcasecmp(el,"userDefined")==0) {
strlcpy(cart->cart_user_defined,xml_data->strbuf,256);
strlcpy(cart->cart_user_defined,xml_data->strbuf,1021);
}
if(strcasecmp(el,"usageCode")==0) {
sscanf(xml_data->strbuf,"%d",&cart->cart_usage_code);
@@ -148,7 +148,7 @@ static void XMLCALL __AddCartElementEnd(void *data, const char *el)
cart->cart_asyncronous=RD_ReadBool(xml_data->strbuf);
}
if(strcasecmp(el,"owner")==0) {
strlcpy(cart->cart_owner,xml_data->strbuf,66);
strlcpy(cart->cart_owner,xml_data->strbuf,257);
}
if(strcasecmp(el,"metadataDatetime")==0) {
strlcpy(hold_datetime,xml_data->strbuf,26);

8
apis/rivwebcapi/rivwebcapi/rd_addcut.c
View File

@@ -80,13 +80,13 @@ static void XMLCALL __AddCutElementEnd(void *data, const char *el)
strlcpy(cut->cut_description,xml_data->strbuf,65);
}
if(strcasecmp(el,"outcue")==0) {
strlcpy(cut->cut_outcue,xml_data->strbuf,65);
strlcpy(cut->cut_outcue,xml_data->strbuf,257);
}
if(strcasecmp(el,"isrc")==0) {
strlcpy(cut->cut_isrc,xml_data->strbuf,13);
strlcpy(cut->cut_isrc,xml_data->strbuf,49);
}
if(strcasecmp(el,"isci")==0) {
strlcpy(cut->cut_isci,xml_data->strbuf,33);
strlcpy(cut->cut_isci,xml_data->strbuf,129);
}
if(strcasecmp(el,"length")==0){
sscanf(xml_data->strbuf,"%u",&cut->cut_length);
@@ -131,7 +131,7 @@ if(strcasecmp(el,"tue")==0) {
strlcpy(cut->cut_end_daypart,xml_data->strbuf,15);
}
if(strcasecmp(el,"originName")==0) {
strlcpy(cut->cut_origin_name,xml_data->strbuf,65);
strlcpy(cut->cut_origin_name,xml_data->strbuf,257);
}
if(strcasecmp(el,"weight")==0) {
sscanf(xml_data->strbuf,"%u",&cut->cut_weight);

26
apis/rivwebcapi/rivwebcapi/rd_cart.h
View File

@@ -21,18 +21,18 @@ enum CART_TYPE {TYPE_ALL,TYPE_AUDIO,TYPE_MACRO};
struct rd_cart {
unsigned cart_number;
unsigned cart_type;
char cart_grp_name[11];
char cart_title[256];
char cart_artist[256];
char cart_album[256];
char cart_grp_name[41];
char cart_title[1021];
char cart_artist[1021];
char cart_album[1021];
int cart_year;
char cart_label[65];
char cart_client[65];
char cart_agency[65];
char cart_publisher[65];
char cart_composer[65];
char cart_conductor[65];
char cart_user_defined[256];
char cart_label[257];
char cart_client[257];
char cart_agency[257];
char cart_publisher[257];
char cart_composer[257];
char cart_conductor[257];
char cart_user_defined[1021];
int cart_usage_code;
int cart_forced_length;
int cart_average_length;
@@ -44,8 +44,8 @@ struct rd_cart {
unsigned cart_validity;
int cart_enforce_length;
int cart_asyncronous;
char cart_owner[65];
char cart_notes[1024];
char cart_owner[257];
char cart_notes[4096];
struct tm cart_metadata_datetime;
};

14
apis/rivwebcapi/rivwebcapi/rd_cut.h
View File

@@ -28,10 +28,10 @@ struct rd_cut {
unsigned cut_cart_number;
unsigned cut_cut_number;
int cut_evergreen;
char cut_description[65];
char cut_outcue[65];
char cut_isrc[13];
char cut_isci[33];
char cut_description[257];
char cut_outcue[257];
char cut_isrc[49];
char cut_isci[129];
unsigned cut_length;
struct tm cut_origin_datetime;
struct tm cut_start_datetime;
@@ -45,9 +45,9 @@ struct rd_cut {
int cut_sat;
char cut_start_daypart[15];
char cut_end_daypart[15];
char cut_origin_name[65];
char cut_origin_login_name[256];
char cut_source_hostname[256];
char cut_origin_name[257];
char cut_origin_login_name[1021];
char cut_source_hostname[1021];
unsigned cut_weight;
struct tm cut_last_play_datetime;
unsigned cut_play_counter;

26
apis/rivwebcapi/rivwebcapi/rd_editcart.c
View File

@@ -84,40 +84,40 @@ static void XMLCALL __EditCartElementEnd(void *data, const char *el)
}
if(strcasecmp(el,"groupName")==0) {
strlcpy(cart->cart_grp_name,xml_data->strbuf,10);
strlcpy(cart->cart_grp_name,xml_data->strbuf,41);
}
if(strcasecmp(el,"title")==0) {
strlcpy(cart->cart_title,xml_data->strbuf,255);
strlcpy(cart->cart_title,xml_data->strbuf,1021);
}
if(strcasecmp(el,"artist")==0) {
strlcpy(cart->cart_artist,xml_data->strbuf,255);
strlcpy(cart->cart_artist,xml_data->strbuf,1021);
}
if(strcasecmp(el,"album")==0) {
strlcpy(cart->cart_album,xml_data->strbuf,255);
strlcpy(cart->cart_album,xml_data->strbuf,1021);
}
if(strcasecmp(el,"year")==0) {
sscanf(xml_data->strbuf,"%d",&cart->cart_year);
}
if(strcasecmp(el,"label")==0) {
strlcpy(cart->cart_label,xml_data->strbuf,64);
strlcpy(cart->cart_label,xml_data->strbuf,257);
}
if(strcasecmp(el,"client")==0) {
strlcpy(cart->cart_client,xml_data->strbuf,64);
strlcpy(cart->cart_client,xml_data->strbuf,257);
}
if(strcasecmp(el,"agency")==0) {
strlcpy(cart->cart_agency,xml_data->strbuf,64);
strlcpy(cart->cart_agency,xml_data->strbuf,257);
}
if(strcasecmp(el,"publisher")==0) {
strlcpy(cart->cart_publisher,xml_data->strbuf,64);
strlcpy(cart->cart_publisher,xml_data->strbuf,257);
}
if(strcasecmp(el,"composer")==0) {
strlcpy(cart->cart_composer,xml_data->strbuf,64);
strlcpy(cart->cart_composer,xml_data->strbuf,257);
}
if(strcasecmp(el,"conductor")==0) {
strlcpy(cart->cart_conductor,xml_data->strbuf,64);
strlcpy(cart->cart_conductor,xml_data->strbuf,257);
}
if(strcasecmp(el,"userDefined")==0) {
strlcpy(cart->cart_user_defined,xml_data->strbuf,255);
strlcpy(cart->cart_user_defined,xml_data->strbuf,1021);
}
if(strcasecmp(el,"usageCode")==0) {
sscanf(xml_data->strbuf,"%d",&cart->cart_usage_code);
@@ -153,11 +153,11 @@ static void XMLCALL __EditCartElementEnd(void *data, const char *el)
cart->cart_asyncronous=RD_ReadBool(xml_data->strbuf);
}
if(strcasecmp(el,"owner")==0) {
strlcpy(cart->cart_owner,xml_data->strbuf,64);
strlcpy(cart->cart_owner,xml_data->strbuf,257);
}
if(strcasecmp(el,"notes")==0 ){
/* handle multiple NOTE Lines */
strlcpy(cart->cart_notes,xml_data->strbuf,1024);
strlcpy(cart->cart_notes,xml_data->strbuf,4096);
}
}

10
apis/rivwebcapi/rivwebcapi/rd_editcut.c
View File

@@ -75,16 +75,16 @@ static void XMLCALL __EditCutElementEnd(void *data, const char *el)
cut->cut_evergreen=RD_ReadBool(xml_data->strbuf);
}
if(strcasecmp(el,"description")==0) {
strncpy(cut->cut_description,xml_data->strbuf,65);
strncpy(cut->cut_description,xml_data->strbuf,257);
}
if(strcasecmp(el,"outcue")==0) {
strncpy(cut->cut_outcue,xml_data->strbuf,65);
strncpy(cut->cut_outcue,xml_data->strbuf,257);
}
if(strcasecmp(el,"isrc")==0) {
strncpy(cut->cut_isrc,xml_data->strbuf,13);
strncpy(cut->cut_isrc,xml_data->strbuf,49);
}
if(strcasecmp(el,"isci")==0) {
strncpy(cut->cut_isci,xml_data->strbuf,33);
strncpy(cut->cut_isci,xml_data->strbuf,129);
}
if(strcasecmp(el,"originDatetime")==0) {
strlcpy(hold_datetime,xml_data->strbuf,26);
@@ -126,7 +126,7 @@ static void XMLCALL __EditCutElementEnd(void *data, const char *el)
strncpy(cut->cut_end_daypart,xml_data->strbuf,15);
}
if(strcasecmp(el,"originName")==0) {
strncpy(cut->cut_origin_name,xml_data->strbuf,65);
strncpy(cut->cut_origin_name,xml_data->strbuf,257);
}
if(strcasecmp(el,"weight")==0) {
sscanf(xml_data->strbuf,"%u",&cut->cut_weight);

6
apis/rivwebcapi/rivwebcapi/rd_group.h
View File

@@ -15,13 +15,13 @@
#define RD_GROUP_H
struct rd_group {
char grp_name[11];
char grp_desc[255];
char grp_name[41];
char grp_desc[1021];
unsigned grp_default_cart_type;
unsigned grp_lo_limit;
unsigned grp_hi_limit;
int grp_shelf_life;
char grp_default_title[255];
char grp_default_title[1021];
int grp_enforce_range;
int grp_report_tfc;
int grp_report_mus;

24
apis/rivwebcapi/rivwebcapi/rd_listcart.c
View File

@@ -84,40 +84,40 @@ static void XMLCALL __ListCartElementEnd(void *data, const char *el)
}
if(strcasecmp(el,"groupName")==0) {
strlcpy(carts->cart_grp_name,xml_data->strbuf,11);
strlcpy(carts->cart_grp_name,xml_data->strbuf,41);
}
if(strcasecmp(el,"title")==0) {
strlcpy(carts->cart_title,xml_data->strbuf,255);
strlcpy(carts->cart_title,xml_data->strbuf,1021);
}
if(strcasecmp(el,"artist")==0) {
strlcpy(carts->cart_artist,xml_data->strbuf,255);
strlcpy(carts->cart_artist,xml_data->strbuf,1021);
}
if(strcasecmp(el,"album")==0) {
strlcpy(carts->cart_album,xml_data->strbuf,255);
strlcpy(carts->cart_album,xml_data->strbuf,1021);
}
if(strcasecmp(el,"year")==0) {
sscanf(xml_data->strbuf,"%d",&carts->cart_year);
}
if(strcasecmp(el,"label")==0) {
strlcpy(carts->cart_label,xml_data->strbuf,64);
strlcpy(carts->cart_label,xml_data->strbuf,257);
}
if(strcasecmp(el,"client")==0) {
strlcpy(carts->cart_client,xml_data->strbuf,64);
strlcpy(carts->cart_client,xml_data->strbuf,257);
}
if(strcasecmp(el,"agency")==0) {
strlcpy(carts->cart_agency,xml_data->strbuf,64);
strlcpy(carts->cart_agency,xml_data->strbuf,257);
}
if(strcasecmp(el,"publisher")==0) {
strlcpy(carts->cart_publisher,xml_data->strbuf,64);
strlcpy(carts->cart_publisher,xml_data->strbuf,257);
}
if(strcasecmp(el,"composer")==0) {
strlcpy(carts->cart_composer,xml_data->strbuf,64);
strlcpy(carts->cart_composer,xml_data->strbuf,257);
}
if(strcasecmp(el,"conductor")==0) {
strlcpy(carts->cart_conductor,xml_data->strbuf,64);
strlcpy(carts->cart_conductor,xml_data->strbuf,257);
}
if(strcasecmp(el,"userDefined")==0) {
strlcpy(carts->cart_user_defined,xml_data->strbuf,255);
strlcpy(carts->cart_user_defined,xml_data->strbuf,1021);
}
if(strcasecmp(el,"usageCode")==0) {
sscanf(xml_data->strbuf,"%d",&carts->cart_usage_code);
@@ -153,7 +153,7 @@ static void XMLCALL __ListCartElementEnd(void *data, const char *el)
carts->cart_asyncronous=RD_ReadBool(xml_data->strbuf);
}
if(strcasecmp(el,"owner")==0) {
strlcpy(carts->cart_owner,xml_data->strbuf,66);
strlcpy(carts->cart_owner,xml_data->strbuf,257);
}
if(strcasecmp(el,"metadataDatetime")==0) {
strlcpy(hold_datetime,xml_data->strbuf,26);

4
apis/rivwebcapi/rivwebcapi/rd_listcartschedcodes.c
View File

@@ -65,10 +65,10 @@ static void XMLCALL __ListCartSchedCodesElementEnd(void *data, const char *el)
struct rd_schedcodes *schedcodes=xml_data->schedcodes+(xml_data->schedcodes_quan-1);
if(strcasecmp(el,"code")==0) {
strlcpy(schedcodes->code,xml_data->strbuf,10);
strlcpy(schedcodes->code,xml_data->strbuf,41);
}
if(strcasecmp(el,"description")==0){
strlcpy(schedcodes->description,xml_data->strbuf,256);
strlcpy(schedcodes->description,xml_data->strbuf,1021);
}
}

14
apis/rivwebcapi/rivwebcapi/rd_listcut.c
View File

@@ -78,16 +78,16 @@ static void XMLCALL __ListCutElementEnd(void *data, const char *el)
cuts->cut_evergreen=RD_ReadBool(xml_data->strbuf);
}
if(strcasecmp(el,"description")==0) {
strlcpy(cuts->cut_description,xml_data->strbuf,65);
strlcpy(cuts->cut_description,xml_data->strbuf,257);
}
if(strcasecmp(el,"outcue")==0) {
strlcpy(cuts->cut_outcue,xml_data->strbuf,65);
strlcpy(cuts->cut_outcue,xml_data->strbuf,257);
}
if(strcasecmp(el,"isrc")==0) {
strlcpy(cuts->cut_isrc,xml_data->strbuf,13);
strlcpy(cuts->cut_isrc,xml_data->strbuf,49);
}
if(strcasecmp(el,"isci")==0) {
strlcpy(cuts->cut_isci,xml_data->strbuf,33);
strlcpy(cuts->cut_isci,xml_data->strbuf,129);
}
if(strcasecmp(el,"length")==0){
sscanf(xml_data->strbuf,"%u",&cuts->cut_length);
@@ -132,13 +132,13 @@ static void XMLCALL __ListCutElementEnd(void *data, const char *el)
strlcpy(cuts->cut_end_daypart,xml_data->strbuf,15);
}
if(strcasecmp(el,"originName")==0) {
strlcpy(cuts->cut_origin_name,xml_data->strbuf,65);
strlcpy(cuts->cut_origin_name,xml_data->strbuf,257);
}
if(strcasecmp(el,"originLoginName")==0) {
strlcpy(cuts->cut_origin_login_name,xml_data->strbuf,256);
strlcpy(cuts->cut_origin_login_name,xml_data->strbuf,1021);
}
if(strcasecmp(el,"sourceHostname")==0) {
strlcpy(cuts->cut_source_hostname,xml_data->strbuf,256);
strlcpy(cuts->cut_source_hostname,xml_data->strbuf,1021);
}
if(strcasecmp(el,"weight")==0) {
sscanf(xml_data->strbuf,"%u",&cuts->cut_weight);

12
apis/rivwebcapi/rivwebcapi/rd_listcuts.c
View File

@@ -83,13 +83,13 @@ static void XMLCALL __ListCutsElementEnd(void *data, const char *el)
strlcpy(cuts->cut_description,xml_data->strbuf,65);
}
if(strcasecmp(el,"outcue")==0) {
strlcpy(cuts->cut_outcue,xml_data->strbuf,65);
strlcpy(cuts->cut_outcue,xml_data->strbuf,257);
}
if(strcasecmp(el,"isrc")==0) {
strlcpy(cuts->cut_isrc,xml_data->strbuf,13);
strlcpy(cuts->cut_isrc,xml_data->strbuf,49);
}
if(strcasecmp(el,"isci")==0) {
strlcpy(cuts->cut_isci,xml_data->strbuf,33);
strlcpy(cuts->cut_isci,xml_data->strbuf,129);
}
if(strcasecmp(el,"length")==0){
sscanf(xml_data->strbuf,"%u",&cuts->cut_length);
@@ -134,13 +134,13 @@ static void XMLCALL __ListCutsElementEnd(void *data, const char *el)
strlcpy(cuts->cut_end_daypart,xml_data->strbuf,10);
}
if(strcasecmp(el,"originName")==0) {
strlcpy(cuts->cut_origin_name,xml_data->strbuf,65);
strlcpy(cuts->cut_origin_name,xml_data->strbuf,257);
}
if(strcasecmp(el,"originLoginName")==0) {
strlcpy(cuts->cut_origin_login_name,xml_data->strbuf,256);
strlcpy(cuts->cut_origin_login_name,xml_data->strbuf,1021);
}
if(strcasecmp(el,"sourceHostname")==0) {
strlcpy(cuts->cut_source_hostname,xml_data->strbuf,256);
strlcpy(cuts->cut_source_hostname,xml_data->strbuf,1021);
}
if(strcasecmp(el,"weight")==0) {
sscanf(xml_data->strbuf,"%u",&cuts->cut_weight);

6
apis/rivwebcapi/rivwebcapi/rd_listgroup.c
View File

@@ -64,10 +64,10 @@ static void XMLCALL __ListGroupElementEnd(void *data, const char *el)
struct rd_group *grp=xml_data->group;
if(strcasecmp(el,"name")==0) {
strlcpy(grp->grp_name,xml_data->strbuf,10);
strlcpy(grp->grp_name,xml_data->strbuf,41);
}
if(strcasecmp(el,"description")==0) {
strlcpy(grp->grp_desc,xml_data->strbuf,255);
strlcpy(grp->grp_desc,xml_data->strbuf,1021);
}
if(strcasecmp(el,"defaultcarttype")==0) {
if(strcasecmp(xml_data->strbuf,"audio")==0) {
@@ -87,7 +87,7 @@ static void XMLCALL __ListGroupElementEnd(void *data, const char *el)
sscanf(xml_data->strbuf,"%d",&grp->grp_shelf_life);
}
if(strcasecmp(el,"defaulttitle")==0) {
strlcpy(grp->grp_default_title,xml_data->strbuf,255);
strlcpy(grp->grp_default_title,xml_data->strbuf,1021);
}
if(strcasecmp(el,"enforcecartrange")==0) {
grp->grp_enforce_range=RD_ReadBool(xml_data->strbuf);

6
apis/rivwebcapi/rivwebcapi/rd_listgroups.c
View File

@@ -65,10 +65,10 @@ static void XMLCALL __ListGroupsElementEnd(void *data, const char *el)
struct rd_group *grp=xml_data->grps+(xml_data->grps_quan-1);
if(strcasecmp(el,"name")==0) {
strlcpy(grp->grp_name,xml_data->strbuf,10);
strlcpy(grp->grp_name,xml_data->strbuf,41);
}
if(strcasecmp(el,"description")==0) {
strlcpy(grp->grp_desc,xml_data->strbuf,256);
strlcpy(grp->grp_desc,xml_data->strbuf,1021);
}
if(strcasecmp(el,"defaultcarttype")==0) {
if(strcasecmp(xml_data->strbuf,"audio")==0) {
@@ -88,7 +88,7 @@ static void XMLCALL __ListGroupsElementEnd(void *data, const char *el)
sscanf(xml_data->strbuf,"%d",&grp->grp_shelf_life);
}
if(strcasecmp(el,"defaulttitle")==0) {
strlcpy(grp->grp_default_title,xml_data->strbuf,256);
strlcpy(grp->grp_default_title,xml_data->strbuf,1021);
}
if(strcasecmp(el,"enforcecartrange")==0) {
grp->grp_enforce_range=RD_ReadBool(xml_data->strbuf);

34
apis/rivwebcapi/rivwebcapi/rd_listlog.c
View File

@@ -133,40 +133,40 @@ static void XMLCALL __ListLogElementEnd(void *data, const char *el)
sscanf(xml_data->strbuf,"%d",&logline->logline_cut_number);
}
if(strcasecmp(el,"groupName")==0) {
strlcpy(logline->logline_group_name,xml_data->strbuf,10);
strlcpy(logline->logline_group_name,xml_data->strbuf,41);
}
if(strcasecmp(el,"groupColor")==0) {
sscanf(xml_data->strbuf,"%s",(char *)&logline->logline_group_color);
}
if(strcasecmp(el,"title")==0) {
strlcpy(logline->logline_title,xml_data->strbuf,256);
strlcpy(logline->logline_title,xml_data->strbuf,1021);
}
if(strcasecmp(el,"artist")==0) {
strlcpy(logline->logline_artist,xml_data->strbuf,256);
strlcpy(logline->logline_artist,xml_data->strbuf,1021);
}
if(strcasecmp(el,"publisher")==0) {
strlcpy(logline->logline_publisher,xml_data->strbuf,65);
strlcpy(logline->logline_publisher,xml_data->strbuf,257);
}
if(strcasecmp(el,"composer")==0) {
strlcpy(logline->logline_composer,xml_data->strbuf,65);
strlcpy(logline->logline_composer,xml_data->strbuf,257);
}
if(strcasecmp(el,"album")==0) {
strlcpy(logline->logline_album,xml_data->strbuf,256);
strlcpy(logline->logline_album,xml_data->strbuf,1021);
}
if(strcasecmp(el,"label")==0) {
strlcpy(logline->logline_label,xml_data->strbuf,65);
strlcpy(logline->logline_label,xml_data->strbuf,257);
}
if(strcasecmp(el,"year")==0) {
sscanf(xml_data->strbuf,"%d",&logline->logline_year);
}
if(strcasecmp(el,"client")==0) {
strlcpy(logline->logline_client,xml_data->strbuf,65);
strlcpy(logline->logline_client,xml_data->strbuf,257);
}
if(strcasecmp(el,"agency")==0) {
strlcpy(logline->logline_agency,xml_data->strbuf,65);
strlcpy(logline->logline_agency,xml_data->strbuf,257);
}
if(strcasecmp(el,"conductor")==0) {
strlcpy(logline->logline_conductor,xml_data->strbuf,65);
strlcpy(logline->logline_conductor,xml_data->strbuf,257);
}
if(strcasecmp(el,"userDefined")==0) {
strlcpy(logline->logline_user_defined,xml_data->strbuf,256);
@@ -239,10 +239,10 @@ static void XMLCALL __ListLogElementEnd(void *data, const char *el)
sscanf(xml_data->strbuf,"%d",&logline->logline_last_cut_played);
}
if(strcasecmp(el,"markerComment")==0) {
strlcpy(logline->logline_marker_comment,xml_data->strbuf,256);
strlcpy(logline->logline_marker_comment,xml_data->strbuf,1021);
}
if(strcasecmp(el,"markerLabel")==0) {
strlcpy(logline->logline_marker_label,xml_data->strbuf,65);
strlcpy(logline->logline_marker_label,xml_data->strbuf,257);
}
if(strcasecmp(el,"originUser")==0) {
sscanf(xml_data->strbuf,"%s",(char *)&logline->logline_origin_user);
@@ -359,7 +359,7 @@ static void XMLCALL __ListLogElementEnd(void *data, const char *el)
sscanf(xml_data->strbuf,"%d",&logline->logline_event_length);
}
if(strcasecmp(el,"linkEventName")==0) {
strlcpy(logline->logline_link_event_name,xml_data->strbuf,64);
strlcpy(logline->logline_link_event_name,xml_data->strbuf,257);
}
if(strcasecmp(el,"linkStartTime")==0) {
logline->logline_link_starttime=RD_Cnv_TString_to_msec(xml_data->strbuf);
@@ -388,16 +388,16 @@ static void XMLCALL __ListLogElementEnd(void *data, const char *el)
sscanf(xml_data->strbuf,"%d",&logline->logline_ext_length);
}
if(strcasecmp(el,"extCartName")==0) {
strlcpy(logline->logline_ext_cart_name,xml_data->strbuf,32);
strlcpy(logline->logline_ext_cart_name,xml_data->strbuf,129);
}
if(strcasecmp(el,"extData")==0) {
strlcpy(logline->logline_ext_data,xml_data->strbuf,32);
strlcpy(logline->logline_ext_data,xml_data->strbuf,129);
}
if(strcasecmp(el,"extEventId")==0) {
strlcpy(logline->logline_ext_event_id,xml_data->strbuf,32);
strlcpy(logline->logline_ext_event_id,xml_data->strbuf,129);
}
if(strcasecmp(el,"extAnncType")==0) {
strlcpy(logline->logline_ext_annc_type,xml_data->strbuf,8);
strlcpy(logline->logline_ext_annc_type,xml_data->strbuf,33);
}
}

37
apis/rivwebcapi/rivwebcapi/rd_listlog.h
View File

@@ -32,22 +32,21 @@ struct rd_logline {
int logline_cart_type;
unsigned logline_cart_number;
int logline_cut_number;
char logline_group_name[11];
char logline_group_name[41];
char logline_group_color[10];
char logline_title[256];
char logline_artist[256];
char logline_album[256];
char logline_title[1021];
char logline_artist[1021];
char logline_album[1021];
int logline_year;
char logline_label[65];
char logline_client[65];
char logline_agency[65];
char logline_publisher[65];
char logline_composer[65];
char logline_conductor[65];
char logline_user_defined[256];
char logline_label[257];
char logline_client[257];
char logline_agency[257];
char logline_publisher[257];
char logline_composer[257];
char logline_conductor[257];
char logline_user_defined[1021];
int logline_usage_code;
int logline_enforce_length;
// char logline_forced_length[10];
int logline_forced_length;
int logline_evergreen;
int logline_source;
@@ -56,9 +55,9 @@ struct rd_logline {
int logline_transition_type;
int logline_cut_quantity;
int logline_last_cut_played;
char logline_marker_comment[256];
char logline_marker_label[65];
char logline_origin_user[256];
char logline_marker_comment[1021];
char logline_marker_label[257];
char logline_origin_user[1021];
struct tm logline_origin_datetime;
int logline_start_point_cart;
int logline_start_point_log;
@@ -91,10 +90,10 @@ struct rd_logline {
int logline_link_embedded;
int logline_ext_starttime;
int logline_ext_length;
char logline_ext_cart_name[33];
char logline_ext_data[33];
char logline_ext_event_id[33];
char logline_ext_annc_type[9];
char logline_ext_cart_name[129];
char logline_ext_data[129];
char logline_ext_event_id[129];
char logline_ext_annc_type[33];
};
int RD_ListLog(struct rd_logline *logline[],

8
apis/rivwebcapi/rivwebcapi/rd_listlogs.c
View File

@@ -67,16 +67,16 @@ static void XMLCALL __ListLogsElementEnd(void *data, const char *el)
char hold_datetime[25];
if(strcasecmp(el,"name")==0) {
strlcpy(logs->log_name,xml_data->strbuf,64);
strlcpy(logs->log_name,xml_data->strbuf,257);
}
if(strcasecmp(el,"serviceName")==0) {
strlcpy(logs->log_service,xml_data->strbuf,10);
strlcpy(logs->log_service,xml_data->strbuf,41);
}
if(strcasecmp(el,"description")==0) {
strlcpy(logs->log_description,xml_data->strbuf,64);
strlcpy(logs->log_description,xml_data->strbuf,257);
}
if(strcasecmp(el,"originUserName")==0) {
strlcpy(logs->log_origin_username,xml_data->strbuf,255);
strlcpy(logs->log_origin_username,xml_data->strbuf,1021);
}
if(strcasecmp(el,"originDatetime")==0) {
strlcpy(hold_datetime,xml_data->strbuf,26);

8
apis/rivwebcapi/rivwebcapi/rd_listlogs.h
View File

@@ -26,10 +26,10 @@
_MYRIVLIB_INIT_DECL
struct rd_log {
char log_name[65];
char log_service[11];
char log_description[65];
char log_origin_username[256];
char log_name[257];
char log_service[41];
char log_description[257];
char log_origin_username[1021];
struct tm log_origin_datetime;
struct tm log_purge_date;
struct tm log_link_datetime;

4
apis/rivwebcapi/rivwebcapi/rd_listschedcodes.c
View File

@@ -64,10 +64,10 @@ static void XMLCALL __ListSchedCodesElementEnd(void *data, const char *el)
struct rd_schedcodes *schedcodes=xml_data->schedcodes+(xml_data->schedcodes_quan-1);
if(strcasecmp(el,"code")==0) {
strlcpy(schedcodes->code,xml_data->strbuf,10);
strlcpy(schedcodes->code,xml_data->strbuf,41);
}
if(strcasecmp(el,"description")==0){
strlcpy(schedcodes->description,xml_data->strbuf,256);
strlcpy(schedcodes->description,xml_data->strbuf,1021);
}
}

4
apis/rivwebcapi/rivwebcapi/rd_listservices.c
View File

@@ -66,10 +66,10 @@ static void XMLCALL __ListServicesElementEnd(void *data, const char *el)
struct rd_service *services=xml_data->services+(xml_data->services_quan-1);
if(strcasecmp(el,"name")==0) {
strlcpy(services->service_name,xml_data->strbuf,11);
strlcpy(services->service_name,xml_data->strbuf,41);
}
if(strcasecmp(el,"description")==0) {
strlcpy(services->service_description,xml_data->strbuf,256);
strlcpy(services->service_description,xml_data->strbuf,1021);
}
}

4
apis/rivwebcapi/rivwebcapi/rd_listservices.h
View File

@@ -26,8 +26,8 @@
_MYRIVLIB_INIT_DECL
struct rd_service {
char service_name [11];
char service_description[256];
char service_name [41];
char service_description[1021];
};
int RD_ListServices(struct rd_service *services[],

4
apis/rivwebcapi/rivwebcapi/rd_listsystemsettings.c
View File

@@ -73,10 +73,10 @@ static void XMLCALL __ListSystemSettingsElementEnd(void *data, const char *el)
sscanf(xml_data->strbuf,"%u",&system_settings->max_post_length);
}
if(strcasecmp(el,"isciXreferencePath")==0){
strlcpy(system_settings->isci_xreference_path,xml_data->strbuf,256);
strlcpy(system_settings->isci_xreference_path,xml_data->strbuf,1021);
}
if(strcasecmp(el,"tempCartGroup")==0){
strlcpy(system_settings->temp_cart_group,xml_data->strbuf,11);
strlcpy(system_settings->temp_cart_group,xml_data->strbuf,41);
}
}

4
apis/rivwebcapi/rivwebcapi/rd_listsystemsettings.h
View File

@@ -25,8 +25,8 @@ struct rd_system_settings {
unsigned sample_rate;
int dup_cart_titles;
unsigned max_post_length;
char isci_xreference_path[256];
char temp_cart_group[11];
char isci_xreference_path[1021];
char temp_cart_group[41];
};
#include <rivwebcapi/rd_common.h>

20
apis/rivwebcapi/rivwebcapi/rd_savelog.h
View File

@@ -26,8 +26,8 @@
_MYRIVLIB_INIT_DECL
struct save_loghdr_values {
char loghdr_service[11];
char loghdr_description[65];
char loghdr_service[41];
char loghdr_description[257];
int loghdr_autorefresh;
struct tm loghdr_purge_date;
struct tm loghdr_start_date;
@@ -53,12 +53,12 @@ struct save_logline_values {
int logline_fadedown_gain;
int logline_duckup_gain;
int logline_duckdown_gain;
char logline_marker_comment[256];
char logline_marker_label[65];
char logline_origin_user[256];
char logline_marker_comment[1021];
char logline_marker_label[257];
char logline_origin_user[1021];
struct tm logline_origin_datetime;
int logline_event_length;
char logline_link_event_name[65];
char logline_link_event_name[257];
struct tm logline_link_starttime;
int logline_link_length;
int logline_link_start_slop;
@@ -67,10 +67,10 @@ struct save_logline_values {
int logline_link_embedded;
struct tm logline_ext_starttime;
int logline_ext_length;
char logline_ext_cart_name[33];
char logline_ext_data[33];
char logline_ext_event_id[33];
char logline_ext_annc_type[9];
char logline_ext_cart_name[129];
char logline_ext_data[129];
char logline_ext_event_id[129];
char logline_ext_annc_type[33];
};
int RD_SaveLog(struct save_loghdr_values *hdrvals,

4
apis/rivwebcapi/rivwebcapi/rd_schedcodes.h
View File

@@ -17,8 +17,8 @@
#define RD_SCHEDCODES_H
struct rd_schedcodes {
char code[11];
char description[255];
char code[41];
char description[1021];
};