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

* 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

View File

@@ -231,17 +231,17 @@
struct rd_cart {
unsigned cart_number; /* Cart Number */
unsigned cart_type; /* Cart Type */
char cart_grp_name[11]; /* Group Name */
char cart_title[256]; /* Cart Title */
char cart_artist[256]; /* Artist */
char cart_album[256]; /* Album */
char cart_grp_name[41]; /* Group Name */
char cart_title[1021]; /* Cart Title */
char cart_artist[1021]; /* Artist */
char cart_album[1021]; /* Album */
int cart_year; /* Year */
char cart_label[65]; /* Label */
char cart_client[65]; /* Client */
char cart_agency[65]; /* Agency */
char cart_publisher[65]; /* Publisher */
char cart_composer[65]; /* Composer */
char cart_user_defined[256]; /* User Defined */
char cart_label[257]; /* Label */
char cart_client[257]; /* Client */
char cart_agency[257]; /* Agency */
char cart_publisher[257]; /* Publisher */
char cart_composer[257]; /* Composer */
char cart_user_defined[1021]; /* User Defined */
int cart_usage_code; /* Usage Code */
int cart_forced_length; /* Forced Length */
int cart_average_length; /* AverageLength */
@@ -253,12 +253,13 @@
unsigned cart_validity; /* Validity */
int cart_enforce_length; /* Enforce Length Flag */
int cart_asyncronous; /* Asyncronous Flag */
char cart_owner[65]; /* Owner */
char cart_owner[257]; /* Owner */
struct tm cart_metadata_datetime; /* Metadata Datetime */
char cart_notes[1024]; /* Notes */
char cart_notes[4098]; /* Notes */
};
All character arrays above are the sizes listed and are null-terminated.
Character encoding is UTF-8.
The cart number is a unsigned integer.

View File

@@ -203,10 +203,10 @@
unsigned cut_cart_number; /* Cart Number */
unsigned cut_cut_number; /* Next available Cut Number */
int cut_evergreen; /* Default is: False */
char cut_description[65]; /* Defualt is: Cut ### */
char cut_outcue[65]; /* Default is: NULL */
char cut_isrc[13]; /* Default is: NULL */
char cut_isci[33]; /* Default is: NULL */
char cut_description[257]; /* Default is: Cut ### */
char cut_outcue[257]; /* Default is: NULL */
char cut_isrc[49]; /* Default is: NULL */
char cut_isci[129]; /* Default is: NULL */
unsigned cut_length; /* Default is: 0 */
struct tm cut_origin_datetime; /* Default is: NULL */
struct tm cut_start_datetime; /* Default is: NULL */
@@ -220,7 +220,7 @@
int cut_sat; /* Default is: true */
char cut_start_daypart[14]; /* Default is: NULL */
char cut_end_daypart[14]; /* Default is: NULL */
char cut_origin_name[65]; /* Default is: NULL */
char cut_origin_name[257]; /* Default is: NULL */
unsigned cut_weight; /* Default is: 1 */
struct tm cut_last_play_datetime; /* Default is: NULL */
unsigned cut_play_counter; /* Default is: 0 */

View File

@@ -220,29 +220,29 @@
</para>
<programlisting>
struct edit_cart_values {
char cart_grp_name[11];
char cart_grp_name[41];
int use_cart_grp_name;
char cart_title[256];
char cart_title[1021];
int use_cart_title;
char cart_artist[256];
char cart_artist[1021];
int use_cart_artist;
char cart_album[256];
char cart_album[1021];
int use_cart_album;
int cart_year;
int use_cart_year;
char cart_label[65];
char cart_label[257];
int use_cart_label;
char cart_client[65];
char cart_client[257];
int use_cart_client;
char cart_agency[65];
char cart_agency[257];
int use_cart_agency;
char cart_publisher[65];
char cart_publisher[257];
int use_cart_publisher;
char cart_composer[65];
char cart_composer[257];
int use_cart_composer;
char cart_conductor[65];
char cart_conductor[257];
int use_cart_conductor;
char cart_user_defined[256];
char cart_user_defined[1021];
int use_cart_user_defined;
int cart_usage_code;
int use_cart_usage_code;
@@ -252,9 +252,9 @@
int use_cart_enforce_length;
int cart_asyncronous;
int use_cart_asyncronous;
char cart_owner[65];
char cart_owner[257];
int use_cart_owner;
char cart_notes[1024];
char cart_notes[4096];
int use_cart_notes;
};
</programlisting>
@@ -266,18 +266,18 @@
struct rd_cart {
unsigned cart_number; /* Cart Number */
unsigned cart_type; /* Cart Type */
char cart_grp_name[11]; /* Group Name */
char cart_title[256]; /* Cart Title */
char cart_artist[256]; /* Artist */
char cart_album[256]; /* Album */
char cart_grp_name[41]; /* Group Name */
char cart_title[1021]; /* Cart Title */
char cart_artist[1021]; /* Artist */
char cart_album[1021]; /* Album */
int cart_year; /* Year */
char cart_label[65]; /* Label */
char cart_client[65]; /* Client */
char cart_agency[65]; /* Agency */
char cart_publisher[65]; /* Publisher */
char cart_composer[65]; /* Composer */
char cart_conductor[65]; /* Conductor */
char cart_user_defined[256]; /* User Defined */
char cart_label[257]; /* Label */
char cart_client[257]; /* Client */
char cart_agency[257]; /* Agency */
char cart_publisher[257]; /* Publisher */
char cart_composer[257]; /* Composer */
char cart_conductor[257]; /* Conductor */
char cart_user_defined[1021]; /* User Defined */
int cart_usage_code; /* Usage Code */
int cart_forced_length; /* Forced Length */
int cart_average_length; /* AverageLength */
@@ -289,11 +289,12 @@
unsigned cart_validity; /* Validity */
int cart_enforce_length; /* Enforce Length Flag */
int cart_asyncronous; /* Asyncronous Flag */
char cart_owner[65]; /* Owner */
char cart_notes[1024]; /* Notes */
char cart_owner[257]; /* Owner */
char cart_notes[4096]; /* Notes */
};
All character arrays above are the sizes listed and are null-terminated.
Character encoding is UTF-8.
The cart number is a unsigned integer.

View File

@@ -237,13 +237,13 @@
struct edit_cut_values {
int cut_evergreen;
int use_cut_evergreen;
char cut_description[65];
char cut_description[257];
int use_cut_description;
char cut_outcue[65];
char cut_outcue[257];
int use_cut_outcue;
char cut_isrc[13];
char cut_isrc[49];
int use_cut_isrc;
char cut_isci[33];
char cut_isci[129];
int use_cut_isci;
struct tm cut_start_datetime;
int use_cut_start_datetime;
@@ -316,10 +316,10 @@
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;
@@ -333,7 +333,7 @@
int cut_sat;
char cut_start_daypart[9];
char cut_end_daypart[9];
char cut_origin_name[65];
char cut_origin_name[257];
unsigned cut_weight;
struct tm cut_last_play_datetime;
unsigned cut_play_counter;
@@ -358,7 +358,8 @@
};
All character arrays above are the sizes listed and are null-terminated.
Character encoding is UTF-8.
</programlisting>
</refsect1>

View File

@@ -233,18 +233,18 @@
struct rd_cart {
unsigned cart_number; /* Cart Number */
unsigned cart_type; /* Cart Type */
char cart_grp_name[11]; /* Group Name */
char cart_title[256]; /* Cart Title */
char cart_artist[256]; /* Artist */
char cart_album[256]; /* Album */
char cart_grp_name[41]; /* Group Name */
char cart_title[1021]; /* Cart Title */
char cart_artist[1021]; /* Artist */
char cart_album[1021]; /* Album */
int cart_year; /* Year */
char cart_label[65]; /* Label */
char cart_client[65]; /* Client */
char cart_agency[65]; /* Agency */
char cart_publisher[65]; /* Publisher */
char cart_composer[65]; /* Composer */
char cart_conductor[65]; /* Conductor */
char cart_user_defined[256]; /* User Defined */
char cart_label[257]; /* Label */
char cart_client[257]; /* Client */
char cart_agency[257]; /* Agency */
char cart_publisher[257]; /* Publisher */
char cart_composer[257]; /* Composer */
char cart_conductor[257]; /* Conductor */
char cart_user_defined[1021]; /* User Defined */
int cart_usage_code; /* Usage Code */
int cart_forced_length; /* Forced Length */
int cart_average_length; /* AverageLength */
@@ -256,12 +256,13 @@
unsigned cart_validity; /* Validity */
int cart_enforce_length; /* Enforce Length Flag */
int cart_asyncronous; /* Asyncronous Flag */
char cart_owner[65]; /* Owner */
char cart_owner[257]; /* Owner */
struct tm cart_metadata_datetime; /* Metatdata Datetime */
char cart_notes[1024]; /* Notes */
char cart_notes[4096]; /* Notes */
};
All character arrays above are the sizes listed and must be null-terminated.
Character encoding is UTF-8.
The cart number is a unsigned integer.

View File

@@ -204,6 +204,7 @@
};
All character arrays above are the sizes listed and must be null-terminated.
Character encoding is UTF-8.
</programlisting>
</refsect1>

View File

@@ -218,10 +218,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;
@@ -235,9 +235,9 @@ struct rd_cut {
int cut_sat;
char cut_start_daypart[9];
char cut_end_daypart[9];
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;
@@ -262,6 +262,7 @@ struct rd_cut {
};
All character arrays above are the sizes listed and must be null-terminated.
Character encoding is UTF-8.
</programlisting>

View File

@@ -204,10 +204,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;
@@ -221,9 +221,9 @@ struct rd_cut {
int cut_sat;
char cut_start_daypart[14];
char cut_end_daypart[14];
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;
@@ -248,6 +248,7 @@ struct rd_cut {
};
All character arrays above are the sizes listed and must be null-terminated.
Charater encoding is UTF-8.
</programlisting>

View File

@@ -199,13 +199,13 @@
</para>
<programlisting>
struct rd_group {
char grp_name[11]; /* Group Name */
char grp_desc[255]; /* Description */
char grp_name[41]; /* Group Name */
char grp_desc[1021]; /* Description */
unsigned grp_default_cart_type; /* Default cart type */
unsigned grp_lo_limit; /* Group starting Cart Number */
unsigned grp_hi_limit; /* Group Ending Cart Number */
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;

View File

@@ -185,13 +185,13 @@
</para>
<programlisting>
struct rd_group {
char grp_name[11]; /* Group Name */
char grp_desc[255]; /* Description */
char grp_name[41]; /* Group Name */
char grp_desc[1021]; /* Description */
unsigned grp_default_cart_type; /* Default cart type */
unsigned grp_lo_limit; /* Group starting Cart Number */
unsigned grp_hi_limit; /* Group Ending Cart Number */
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;
@@ -201,6 +201,7 @@
};
All character arrays above are the sizes listed and must be null-terminated.
Character encoding is UTF-8.
The cart number is a unsigned integer.

View File

@@ -207,17 +207,17 @@ struct rd_logline {
unsigned logline_cut_number;
char logline_group_name[11];
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];
@@ -228,9 +228,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;
@@ -256,6 +256,7 @@ struct rd_logline {
};
All character arrays above are the sizes listed and must be null-terminated.
Charater encoding is UTF-8.
logline_line is a integer which represents the line number in the log.

View File

@@ -260,10 +260,10 @@
</para>
<programlisting>
struct rd_log {
char log_name[11];
char log_service[11];
char log_description[65];
char log_origin_username[256];
char log_name[41];
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;
@@ -280,6 +280,7 @@
};
All character arrays above are the sizes listed and must be null-terminated.
Character encoding is UTF-8.
</programlisting>

View File

@@ -184,8 +184,8 @@
</para>
<programlisting>
struct rd_schedcodes {
char code[11];
char description[255];
char code[41];
char description[1021];
};
All character arrays above are the sizes listed and must be null-terminated.

View File

@@ -199,8 +199,8 @@
</para>
<programlisting>
struct rd_service {
char service_name [11];
char service_description[256];
char service_name [41];
char service_description[1021];
};
</programlisting>

View File

@@ -184,8 +184,8 @@
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];
};
</programlisting>

View File

@@ -245,12 +245,12 @@
int logline_fadedown_point_log;
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;
@@ -259,10 +259,10 @@
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];
};
</programlisting>
</refsect1>