[dvblast-devel] Change charset names from ISO_xxx to ISO-xxx.

Georgi Chorbadzhiyski git at videolan.org
Tue Oct 29 10:46:14 CET 2013


dvblast | branch: master | Georgi Chorbadzhiyski <gf at unixsol.org> | Tue Oct 29 11:45:11 2013 +0200| [317c81a35d9752a3a4049b8889097d358f6ad189] | committer: Georgi Chorbadzhiyski

Change charset names from ISO_xxx to ISO-xxx.

This prevents errors when using uclibc's iconv.

> http://git.videolan.org/gitweb.cgi/dvblast.git/?a=commit;h=317c81a35d9752a3a4049b8889097d358f6ad189
---

 dvblast.1 |    2 +-
 dvblast.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dvblast.1 b/dvblast.1
index db96d94..f42d6b3 100644
--- a/dvblast.1
+++ b/dvblast.1
@@ -97,7 +97,7 @@ Inversion (-1 auto, 0 off, 1 on)
 Character set used for printing messages (default UTF-8)
 .TP
 \fB\-J\fR, \fB\-\-dvb-charset\fR <charset>
-Character set used in output DVB tables (default ISO_8859-1)
+Character set used in output DVB tables (default ISO-8859-1)
 .TP
 \fB\-k\fR, \fB\-\-uncommitted\fR <uncommitted port>
 Port number for uncommitted diseqc (0: no uncommitted diseqc, 1\-4)
diff --git a/dvblast.c b/dvblast.c
index f959dd4..0e744a4 100644
--- a/dvblast.c
+++ b/dvblast.c
@@ -93,7 +93,7 @@ size_t i_network_name_size;
 char *psz_udp_src = NULL;
 int i_asi_adapter = 0;
 const char *psz_native_charset = "UTF-8";
-const char *psz_dvb_charset = "ISO_8859-1";
+const char *psz_dvb_charset = "ISO-8859-1";
 const char *psz_provider_name = NULL;
 print_type_t i_print_type = PRINT_TEXT;
 bool b_print_enabled = false;
@@ -569,7 +569,7 @@ void usage()
     msg_Raw( NULL, "  -h --help             display this full help" );
     msg_Raw( NULL, "  -i --priority <RT priority>" );
     msg_Raw( NULL, "  -j --system-charset   character set used for printing messages (default UTF-8)" );
-    msg_Raw( NULL, "  -J --dvb-charset      character set used in output DVB tables (default ISO_8859-1)" );
+    msg_Raw( NULL, "  -J --dvb-charset      character set used in output DVB tables (default ISO-8859-1)" );
     msg_Raw( NULL, "  -l --logger           use syslog for logging messages instead of stderr" );
     msg_Raw( NULL, "  -g --logger-ident     program name that will be used in syslog messages" );
     msg_Raw( NULL, "  -x --print            print interesting events on stdout in a given format" );



More information about the dvblast-devel mailing list