[PATCH 0/5] Further clean up libdvbv5

[PATCH 0/5] Further clean up libdvbv5

[Gregor Jasny]

Hello,

Here you'll find some patches to clean up libdvbv5. I tried to
reduce exported symbols of the shared library to easy
maintenance in the future.

Thanks,
Gregor

Gregor Jasny (5):
  libdvbv5: Remove dvbsat_polarization_name (same as dvb_sat_pol_name)
  libdvbv5: Rename and hide charset definitions
  libdvbv5: Hide unused and unexposed cnr_to_qual_s tables
  libdvbv5: Make dvb_xxx_charset const strings
  libdvbv5: Make dummy_fe static

 lib/include/libdvbv5/descriptors.h             |  2 --
 lib/include/libdvbv5/dvb-sat.h                 |  2 --
 lib/libdvbv5/descriptors.c                     |  3 ---
 lib/libdvbv5/descriptors/desc_event_extended.c |  2 +-
 lib/libdvbv5/descriptors/desc_event_short.c    |  4 ++--
 lib/libdvbv5/descriptors/desc_network_name.c   |  2 +-
 lib/libdvbv5/descriptors/desc_service.c        |  4 ++--
 lib/libdvbv5/descriptors/desc_ts_info.c        |  2 +-
 lib/libdvbv5/dvb-fe.c                          |  6 +++---
 lib/libdvbv5/dvb-sat.c                         |  7 -------
 lib/libdvbv5/parse_string.c                    | 12 ++++++++----
 lib/libdvbv5/parse_string.h                    |  7 +++++--
 lib/libdvbv5/tables/vct.c                      |  2 +-
 13 files changed, 24 insertions(+), 31 deletions(-)

-- 
2.1.0

[PATCH 1/5] libdvbv5: Remove dvbsat_polarization_name (same as dvb_sat_pol_name)

[Gregor Jasny]

Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
---
 lib/include/libdvbv5/dvb-sat.h | 2 --
 lib/libdvbv5/dvb-sat.c         | 7 -------
 2 files changed, 9 deletions(-)

diff --git a/lib/include/libdvbv5/dvb-sat.h b/lib/include/libdvbv5/dvb-sat.h
index a414448..f14e7e4 100644
--- a/lib/include/libdvbv5/dvb-sat.h
+++ b/lib/include/libdvbv5/dvb-sat.h
@@ -37,8 +37,6 @@ struct dvb_sat_lnb {
 
 struct dvb_v5_fe_parms;
 
-extern const char *dvbsat_polarization_name[5];
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/lib/libdvbv5/dvb-sat.c b/lib/libdvbv5/dvb-sat.c
index 795524a..d0a6076 100644
--- a/lib/libdvbv5/dvb-sat.c
+++ b/lib/libdvbv5/dvb-sat.c
@@ -405,10 +405,3 @@ ret:
 	return rc;
 }
 
-const char *dvbsat_polarization_name[5] = {
-	"OFF",
-	"H",
-	"V",
-	"L",
-	"R",
-};
-- 
2.1.0

[PATCH 2/5] libdvbv5: Rename and hide charset definitions

[Gregor Jasny]

Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
---
 lib/include/libdvbv5/descriptors.h             | 2 --
 lib/libdvbv5/descriptors.c                     | 3 ---
 lib/libdvbv5/descriptors/desc_event_extended.c | 2 +-
 lib/libdvbv5/descriptors/desc_event_short.c    | 4 ++--
 lib/libdvbv5/descriptors/desc_network_name.c   | 2 +-
 lib/libdvbv5/descriptors/desc_service.c        | 4 ++--
 lib/libdvbv5/descriptors/desc_ts_info.c        | 2 +-
 lib/libdvbv5/parse_string.c                    | 3 +++
 lib/libdvbv5/parse_string.h                    | 3 +++
 lib/libdvbv5/tables/vct.c                      | 2 +-
 10 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/lib/include/libdvbv5/descriptors.h b/lib/include/libdvbv5/descriptors.h
index 88b8ad2..47738d8 100644
--- a/lib/include/libdvbv5/descriptors.h
+++ b/lib/include/libdvbv5/descriptors.h
@@ -38,8 +38,6 @@ struct dvb_v5_fe_parms;
 typedef void (*dvb_table_init_func)(struct dvb_v5_fe_parms *parms, const uint8_t *buf, ssize_t buflen, void **table);
 
 extern const dvb_table_init_func dvb_table_initializers[256];
-extern char *default_charset;
-extern char *output_charset;
 
 #define bswap16(b) do {\
 	b = ntohs(b); \
diff --git a/lib/libdvbv5/descriptors.c b/lib/libdvbv5/descriptors.c
index 5f61332..8e7ebb1 100644
--- a/lib/libdvbv5/descriptors.c
+++ b/lib/libdvbv5/descriptors.c
@@ -96,9 +96,6 @@ const dvb_table_init_func dvb_table_initializers[256] = {
 	[ATSC_TABLE_CVCT]        = TABLE_INIT(atsc_table_vct),
 };
 
-char *default_charset = "iso-8859-1";
-char *output_charset = "utf-8";
-
 int dvb_desc_parse(struct dvb_v5_fe_parms *parms, const uint8_t *buf,
 			   uint16_t buflen, struct dvb_desc **head_desc)
 {
diff --git a/lib/libdvbv5/descriptors/desc_event_extended.c b/lib/libdvbv5/descriptors/desc_event_extended.c
index 6af38f2..71e747a 100644
--- a/lib/libdvbv5/descriptors/desc_event_extended.c
+++ b/lib/libdvbv5/descriptors/desc_event_extended.c
@@ -59,7 +59,7 @@ int dvb_desc_event_extended_init(struct dvb_v5_fe_parms *parms, const uint8_t *b
 	len = *buf;
 	len1 = len;
 	buf++;
-	parse_string(parms, &event->text, &event->text_emph, buf, len1, default_charset, output_charset);
+	parse_string(parms, &event->text, &event->text_emph, buf, len1, dvb_default_charset, dvb_output_charset);
 	buf += len;
 	return 0;
 }
diff --git a/lib/libdvbv5/descriptors/desc_event_short.c b/lib/libdvbv5/descriptors/desc_event_short.c
index adb38fe..9b19269 100644
--- a/lib/libdvbv5/descriptors/desc_event_short.c
+++ b/lib/libdvbv5/descriptors/desc_event_short.c
@@ -42,7 +42,7 @@ int dvb_desc_event_short_init(struct dvb_v5_fe_parms *parms, const uint8_t *buf,
 	len = buf[0];
 	buf++;
 	len1 = len;
-	parse_string(parms, &event->name, &event->name_emph, buf, len1, default_charset, output_charset);
+	parse_string(parms, &event->name, &event->name_emph, buf, len1, dvb_default_charset, dvb_output_charset);
 	buf += len;
 
 	event->text = NULL;
@@ -50,7 +50,7 @@ int dvb_desc_event_short_init(struct dvb_v5_fe_parms *parms, const uint8_t *buf,
 	len = buf[0];
 	len2 = len;
 	buf++;
-	parse_string(parms, &event->text, &event->text_emph, buf, len2, default_charset, output_charset);
+	parse_string(parms, &event->text, &event->text_emph, buf, len2, dvb_default_charset, dvb_output_charset);
 	buf += len;
 	return 0;
 }
diff --git a/lib/libdvbv5/descriptors/desc_network_name.c b/lib/libdvbv5/descriptors/desc_network_name.c
index a34a27f..17cdbd4 100644
--- a/lib/libdvbv5/descriptors/desc_network_name.c
+++ b/lib/libdvbv5/descriptors/desc_network_name.c
@@ -33,7 +33,7 @@ int dvb_desc_network_name_init(struct dvb_v5_fe_parms *parms, const uint8_t *buf
 	len1 = len;
 	net->network_name = NULL;
 	net->network_name_emph = NULL;
-	parse_string(parms, &net->network_name, &net->network_name_emph, buf, len1, default_charset, output_charset);
+	parse_string(parms, &net->network_name, &net->network_name_emph, buf, len1, dvb_default_charset, dvb_output_charset);
 	buf += len;
 	return 0;
 }
diff --git a/lib/libdvbv5/descriptors/desc_service.c b/lib/libdvbv5/descriptors/desc_service.c
index 069317a..6858c32 100644
--- a/lib/libdvbv5/descriptors/desc_service.c
+++ b/lib/libdvbv5/descriptors/desc_service.c
@@ -37,7 +37,7 @@ int dvb_desc_service_init(struct dvb_v5_fe_parms *parms, const uint8_t *buf, str
 	len = buf[0];
 	buf++;
 	len1 = len;
-	parse_string(parms, &service->provider, &service->provider_emph, buf, len1, default_charset, output_charset);
+	parse_string(parms, &service->provider, &service->provider_emph, buf, len1, dvb_default_charset, dvb_output_charset);
 	buf += len;
 
 	service->name = NULL;
@@ -45,7 +45,7 @@ int dvb_desc_service_init(struct dvb_v5_fe_parms *parms, const uint8_t *buf, str
 	len = buf[0];
 	len2 = len;
 	buf++;
-	parse_string(parms, &service->name, &service->name_emph, buf, len2, default_charset, output_charset);
+	parse_string(parms, &service->name, &service->name_emph, buf, len2, dvb_default_charset, dvb_output_charset);
 	buf += len;
 	return 0;
 }
diff --git a/lib/libdvbv5/descriptors/desc_ts_info.c b/lib/libdvbv5/descriptors/desc_ts_info.c
index 75501af..713c1b8 100644
--- a/lib/libdvbv5/descriptors/desc_ts_info.c
+++ b/lib/libdvbv5/descriptors/desc_ts_info.c
@@ -40,7 +40,7 @@ int dvb_desc_ts_info_init(struct dvb_v5_fe_parms *parms,
 	d->ts_name = NULL;
 	d->ts_name_emph = NULL;
 	parse_string(parms, &d->ts_name, &d->ts_name_emph, buf, len,
-		     default_charset, output_charset);
+		     dvb_default_charset, dvb_output_charset);
 	p += len;
 
 	memcpy(&d->transmission_type, p, sizeof(d->transmission_type));
diff --git a/lib/libdvbv5/parse_string.c b/lib/libdvbv5/parse_string.c
index 0e94cf2..db47c3a 100644
--- a/lib/libdvbv5/parse_string.c
+++ b/lib/libdvbv5/parse_string.c
@@ -35,6 +35,9 @@
 
 #define CS_OPTIONS "//TRANSLIT"
 
+char *dvb_default_charset = "iso-8859-1";
+char *dvb_output_charset = "utf-8";
+
 struct charset_conv {
 	unsigned len;
 	unsigned char  data[3];
diff --git a/lib/libdvbv5/parse_string.h b/lib/libdvbv5/parse_string.h
index 39f7dc4..e269ff3 100644
--- a/lib/libdvbv5/parse_string.h
+++ b/lib/libdvbv5/parse_string.h
@@ -34,6 +34,9 @@ void parse_string(struct dvb_v5_fe_parms *parms, char **dest, char **emph,
 		  const unsigned char *src, size_t len,
 		  char *default_charset, char *output_charset);
 
+extern char *dvb_default_charset;
+extern char *dvb_output_charset;
+
 #if HAVE_VISIBILITY
 #pragma GCC visibility pop
 #endif
diff --git a/lib/libdvbv5/tables/vct.c b/lib/libdvbv5/tables/vct.c
index e761a7d..73bae63 100644
--- a/lib/libdvbv5/tables/vct.c
+++ b/lib/libdvbv5/tables/vct.c
@@ -101,7 +101,7 @@ ssize_t atsc_table_vct_init(struct dvb_v5_fe_parms *parms, const uint8_t *buf,
 				 (const unsigned char *)channel->__short_name,
 				 sizeof(channel->__short_name),
 				 "UTF-16",
-				 output_charset);
+				 dvb_output_charset);
 
 		/* Fill descriptors */
 
-- 
2.1.0

[PATCH 3/5] libdvbv5: Hide unused and unexposed cnr_to_qual_s tables

[Gregor Jasny]

Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
---
 lib/libdvbv5/dvb-fe.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/libdvbv5/dvb-fe.c b/lib/libdvbv5/dvb-fe.c
index 013edd6..6471f68 100644
--- a/lib/libdvbv5/dvb-fe.c
+++ b/lib/libdvbv5/dvb-fe.c
@@ -944,7 +944,7 @@ struct cnr_to_qual_s dvb_s2_cnr_2_qual[] = {
  * Minimum values from ARIB STD-B21 for DVB_QUAL_OK.
  * As ARIB doesn't define a max value, assume +2dB for DVB_QUAL_GOOD
  */
-struct cnr_to_qual_s isdb_t_cnr_2_qual[] = {
+static struct cnr_to_qual_s isdb_t_cnr_2_qual[] = {
 	{  DQPSK, FEC_1_2,  6.2,  8.2},
 	{  DQPSK, FEC_2_3,  7.7,  9.7},
 	{  DQPSK, FEC_3_4,  8.7, 10.7},
@@ -974,7 +974,7 @@ struct cnr_to_qual_s isdb_t_cnr_2_qual[] = {
  * Values obtained from table A.1 of ETSI EN 300 744 v1.6.1
  * OK corresponds to Ricean fading; Good to Rayleigh fading
  */
-struct cnr_to_qual_s dvb_t_cnr_2_qual[] = {
+static struct cnr_to_qual_s dvb_t_cnr_2_qual[] = {
 	{   QPSK, FEC_1_2,  4.1,  5.9},
 	{   QPSK, FEC_2_3,  6.1,  9.6},
 	{   QPSK, FEC_3_4,  7.2, 12.4},
-- 
2.1.0

[PATCH 4/5] libdvbv5: Make dvb_xxx_charset const strings

[Gregor Jasny]

Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
---
 lib/libdvbv5/parse_string.c | 13 +++++++------
 lib/libdvbv5/parse_string.h |  8 ++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/lib/libdvbv5/parse_string.c b/lib/libdvbv5/parse_string.c
index db47c3a..081b2f8 100644
--- a/lib/libdvbv5/parse_string.c
+++ b/lib/libdvbv5/parse_string.c
@@ -35,8 +35,8 @@
 
 #define CS_OPTIONS "//TRANSLIT"
 
-char *dvb_default_charset = "iso-8859-1";
-char *dvb_output_charset = "utf-8";
+const char *dvb_default_charset = "iso-8859-1";
+const char *dvb_output_charset = "utf-8";
 
 struct charset_conv {
 	unsigned len;
@@ -308,7 +308,7 @@ void iconv_to_charset(struct dvb_v5_fe_parms *parms,
 		      size_t destlen,
 		      const unsigned char *src,
 		      size_t len,
-		      char *type, char *output_charset)
+		      const char *type, const char *output_charset)
 {
 	char out_cs[strlen(output_charset) + 1 + sizeof(CS_OPTIONS)];
 	char *p = dest;
@@ -331,7 +331,7 @@ void iconv_to_charset(struct dvb_v5_fe_parms *parms,
 
 static void charset_conversion(struct dvb_v5_fe_parms *parms, char **dest, const unsigned char *s,
 			       size_t len,
-			       char *type, char *output_charset)
+			       const char *type, const char *output_charset)
 {
 	size_t destlen = len * 3;
 	int need_conversion = 1;
@@ -371,10 +371,11 @@ static void charset_conversion(struct dvb_v5_fe_parms *parms, char **dest, const
 
 void parse_string(struct dvb_v5_fe_parms *parms, char **dest, char **emph,
 		  const unsigned char *src, size_t len,
-		  char *default_charset, char *output_charset)
+		  const char *default_charset, const char *output_charset)
 {
 	size_t destlen, i, len2 = 0;
-	char *p, *p2, *type = default_charset;
+	char *p, *p2;
+	const char *type = default_charset;
 	unsigned char *tmp1 = NULL, *tmp2 = NULL;
 	const unsigned char *s;
 	int emphasis = 0;
diff --git a/lib/libdvbv5/parse_string.h b/lib/libdvbv5/parse_string.h
index e269ff3..48ae6ec 100644
--- a/lib/libdvbv5/parse_string.h
+++ b/lib/libdvbv5/parse_string.h
@@ -28,14 +28,14 @@ void iconv_to_charset(struct dvb_v5_fe_parms *parms,
 		      size_t destlen,
 		      const unsigned char *src,
 		      size_t len,
-		      char *type, char *output_charset);
+		      const char *type, const char *output_charset);
 
 void parse_string(struct dvb_v5_fe_parms *parms, char **dest, char **emph,
 		  const unsigned char *src, size_t len,
-		  char *default_charset, char *output_charset);
+		  const char *default_charset, const char *output_charset);
 
-extern char *dvb_default_charset;
-extern char *dvb_output_charset;
+extern const char *dvb_default_charset;
+extern const char *dvb_output_charset;
 
 #if HAVE_VISIBILITY
 #pragma GCC visibility pop
-- 
2.1.0

[PATCH 5/5] libdvbv5: Make dummy_fe static

[Gregor Jasny]

Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
---
 lib/libdvbv5/dvb-fe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/libdvbv5/dvb-fe.c b/lib/libdvbv5/dvb-fe.c
index 6471f68..c260674 100644
--- a/lib/libdvbv5/dvb-fe.c
+++ b/lib/libdvbv5/dvb-fe.c
@@ -35,7 +35,7 @@ static void dvb_v5_free(struct dvb_v5_fe_parms *parms)
 	free(parms);
 }
 
-struct dvb_v5_fe_parms dummy_fe;
+static struct dvb_v5_fe_parms dummy_fe;
 struct dvb_v5_fe_parms *dvb_fe_dummy()
 {
 	dummy_fe.logfunc = dvb_default_log;
-- 
2.1.0

Re: [PATCH 0/5] Further clean up libdvbv5

[Mauro Carvalho Chehab]

Hi Gregor,

Em Sat, 23 Aug 2014 18:42:38 +0200
Gregor Jasny <gjasny@googlemail.com> escreveu:

> Hello,
> 
> Here you'll find some patches to clean up libdvbv5. I tried to
> reduce exported symbols of the shared library to easy
> maintenance in the future.
> 
> Thanks,
> Gregor
> 
> Gregor Jasny (5):
>   libdvbv5: Remove dvbsat_polarization_name (same as dvb_sat_pol_name)
>   libdvbv5: Rename and hide charset definitions
>   libdvbv5: Hide unused and unexposed cnr_to_qual_s tables
>   libdvbv5: Make dvb_xxx_charset const strings
>   libdvbv5: Make dummy_fe static

All patches except patch 4 is ok. I merged them upstream already.

With regards to patch 4 (Make dvb_xxx_charset const strings), those
strings should not be const, but, instead, configurable, as the
default charset decoding may actually var from Country to Country.

For example, on ISDB-T, Japan uses one default, while Brazil uses
another one.

Also, the system may not be using UTF-8 as its charset.

So, the best is to add two functions that would allow the applications
based on libdvbv5 to set it, overriding the default.

I'll work on such patches and post at ML for you to take a look.

Regards,
Mauro

> 
>  lib/include/libdvbv5/descriptors.h             |  2 --
>  lib/include/libdvbv5/dvb-sat.h                 |  2 --
>  lib/libdvbv5/descriptors.c                     |  3 ---
>  lib/libdvbv5/descriptors/desc_event_extended.c |  2 +-
>  lib/libdvbv5/descriptors/desc_event_short.c    |  4 ++--
>  lib/libdvbv5/descriptors/desc_network_name.c   |  2 +-
>  lib/libdvbv5/descriptors/desc_service.c        |  4 ++--
>  lib/libdvbv5/descriptors/desc_ts_info.c        |  2 +-
>  lib/libdvbv5/dvb-fe.c                          |  6 +++---
>  lib/libdvbv5/dvb-sat.c                         |  7 -------
>  lib/libdvbv5/parse_string.c                    | 12 ++++++++----
>  lib/libdvbv5/parse_string.h                    |  7 +++++--
>  lib/libdvbv5/tables/vct.c                      |  2 +-
>  13 files changed, 24 insertions(+), 31 deletions(-)
>