summaryrefslogtreecommitdiff
path: root/src/xine-utils
diff options
context:
space:
mode:
Diffstat (limited to 'src/xine-utils')
-rw-r--r--src/xine-utils/array.c2
-rw-r--r--src/xine-utils/array.h2
-rw-r--r--src/xine-utils/attributes.h2
-rw-r--r--src/xine-utils/color.c2
-rw-r--r--src/xine-utils/compat.h2
-rw-r--r--src/xine-utils/copy.c2
-rw-r--r--src/xine-utils/cpu_accel.c2
-rw-r--r--src/xine-utils/list.c2
-rw-r--r--src/xine-utils/list.h2
-rw-r--r--src/xine-utils/memcpy.c2
-rw-r--r--src/xine-utils/monitor.c2
-rw-r--r--src/xine-utils/pool.c2
-rw-r--r--src/xine-utils/pool.h2
-rw-r--r--src/xine-utils/ring_buffer.c2
-rw-r--r--src/xine-utils/ring_buffer.h2
-rw-r--r--src/xine-utils/sorted_array.c2
-rw-r--r--src/xine-utils/sorted_array.h2
-rw-r--r--src/xine-utils/utils.c2
-rw-r--r--src/xine-utils/xine_buffer.c2
-rw-r--r--src/xine-utils/xine_buffer.h2
-rw-r--r--src/xine-utils/xine_check.c2
-rw-r--r--src/xine-utils/xine_mutex.c2
-rw-r--r--src/xine-utils/xineutils.h2
-rw-r--r--src/xine-utils/xmllexer.c29
-rw-r--r--src/xine-utils/xmllexer.h4
-rw-r--r--src/xine-utils/xmlparser.c4
-rw-r--r--src/xine-utils/xmlparser.h4
27 files changed, 53 insertions, 34 deletions
diff --git a/src/xine-utils/array.c b/src/xine-utils/array.c
index ed529515b..9b514b59c 100644
--- a/src/xine-utils/array.c
+++ b/src/xine-utils/array.c
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* $Id: array.c,v 1.4 2007/02/03 16:31:55 dsalt Exp $
*
diff --git a/src/xine-utils/array.h b/src/xine-utils/array.h
index 80b7d3c9b..d23a77a52 100644
--- a/src/xine-utils/array.h
+++ b/src/xine-utils/array.h
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* $Id: array.h,v 1.3 2007/02/03 16:31:55 dsalt Exp $
*
diff --git a/src/xine-utils/attributes.h b/src/xine-utils/attributes.h
index a9be4792f..b25c76572 100644
--- a/src/xine-utils/attributes.h
+++ b/src/xine-utils/attributes.h
@@ -18,7 +18,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*/
/* use gcc attribs to align critical data structures */
diff --git a/src/xine-utils/color.c b/src/xine-utils/color.c
index c5d42be9d..261dbe204 100644
--- a/src/xine-utils/color.c
+++ b/src/xine-utils/color.c
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* Color Conversion Utility Functions
*
diff --git a/src/xine-utils/compat.h b/src/xine-utils/compat.h
index a6592b030..045fa8368 100644
--- a/src/xine-utils/compat.h
+++ b/src/xine-utils/compat.h
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* $Id: compat.h,v 1.3 2003/04/20 21:13:26 guenter Exp $
*
diff --git a/src/xine-utils/copy.c b/src/xine-utils/copy.c
index 1a609ed89..ed42b3a88 100644
--- a/src/xine-utils/copy.c
+++ b/src/xine-utils/copy.c
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* $Id:
*
diff --git a/src/xine-utils/cpu_accel.c b/src/xine-utils/cpu_accel.c
index 06ee90cd3..8bad23db9 100644
--- a/src/xine-utils/cpu_accel.c
+++ b/src/xine-utils/cpu_accel.c
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*/
#include "config.h"
diff --git a/src/xine-utils/list.c b/src/xine-utils/list.c
index 2c790c3db..a440ade9c 100644
--- a/src/xine-utils/list.c
+++ b/src/xine-utils/list.c
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* $Id: list.c,v 1.12 2006/09/26 05:19:49 dgp85 Exp $
*
diff --git a/src/xine-utils/list.h b/src/xine-utils/list.h
index 8273d30f1..ac1c91b5a 100644
--- a/src/xine-utils/list.h
+++ b/src/xine-utils/list.h
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* $Id: list.h,v 1.5 2007/02/19 23:34:32 dgp85 Exp $
*
diff --git a/src/xine-utils/memcpy.c b/src/xine-utils/memcpy.c
index 67645081e..da4b83b09 100644
--- a/src/xine-utils/memcpy.c
+++ b/src/xine-utils/memcpy.c
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* These are the MMX/MMX2/SSE optimized versions of memcpy
*
diff --git a/src/xine-utils/monitor.c b/src/xine-utils/monitor.c
index b19195065..ad1bfc5e7 100644
--- a/src/xine-utils/monitor.c
+++ b/src/xine-utils/monitor.c
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* $Id: monitor.c,v 1.8 2006/06/23 18:24:22 dsalt Exp $
*
diff --git a/src/xine-utils/pool.c b/src/xine-utils/pool.c
index 39dbccb0c..cd0e40b0d 100644
--- a/src/xine-utils/pool.c
+++ b/src/xine-utils/pool.c
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* $Id: pool.c,v 1.2 2006/09/26 05:19:49 dgp85 Exp $
*
diff --git a/src/xine-utils/pool.h b/src/xine-utils/pool.h
index 5f6e4bd7e..01ef69556 100644
--- a/src/xine-utils/pool.h
+++ b/src/xine-utils/pool.h
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* $Id: pool.h,v 1.2 2006/09/26 05:19:49 dgp85 Exp $
*
diff --git a/src/xine-utils/ring_buffer.c b/src/xine-utils/ring_buffer.c
index dc8ddbf80..ed3b3aee9 100644
--- a/src/xine-utils/ring_buffer.c
+++ b/src/xine-utils/ring_buffer.c
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* $Id: ring_buffer.c,v 1.5 2006/09/26 05:19:49 dgp85 Exp $
*
diff --git a/src/xine-utils/ring_buffer.h b/src/xine-utils/ring_buffer.h
index fc826ba21..1c5bbcf51 100644
--- a/src/xine-utils/ring_buffer.h
+++ b/src/xine-utils/ring_buffer.h
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* $Id: ring_buffer.h,v 1.3 2006/09/26 05:19:49 dgp85 Exp $
*
diff --git a/src/xine-utils/sorted_array.c b/src/xine-utils/sorted_array.c
index c69d92d40..c3dad54c9 100644
--- a/src/xine-utils/sorted_array.c
+++ b/src/xine-utils/sorted_array.c
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* $Id: sorted_array.c,v 1.3 2006/09/26 05:19:49 dgp85 Exp $
*
diff --git a/src/xine-utils/sorted_array.h b/src/xine-utils/sorted_array.h
index 767a2913c..9a4d61bd8 100644
--- a/src/xine-utils/sorted_array.h
+++ b/src/xine-utils/sorted_array.h
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* $Id: sorted_array.h,v 1.3 2006/09/26 05:19:49 dgp85 Exp $
*
diff --git a/src/xine-utils/utils.c b/src/xine-utils/utils.c
index f79d2ebce..20286e7f6 100644
--- a/src/xine-utils/utils.c
+++ b/src/xine-utils/utils.c
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* $Id: utils.c,v 1.46 2006/07/21 04:47:17 dgp85 Exp $
*
diff --git a/src/xine-utils/xine_buffer.c b/src/xine-utils/xine_buffer.c
index 17b3a79db..842253ecb 100644
--- a/src/xine-utils/xine_buffer.c
+++ b/src/xine-utils/xine_buffer.c
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* $Id: xine_buffer.c,v 1.11 2006/06/23 18:24:22 dsalt Exp $
*
diff --git a/src/xine-utils/xine_buffer.h b/src/xine-utils/xine_buffer.h
index 02a9e2cb1..b1c99ee34 100644
--- a/src/xine-utils/xine_buffer.h
+++ b/src/xine-utils/xine_buffer.h
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* $Id: xine_buffer.h,v 1.7 2006/09/26 05:19:49 dgp85 Exp $
*
diff --git a/src/xine-utils/xine_check.c b/src/xine-utils/xine_check.c
index f6a0498e8..f00a23832 100644
--- a/src/xine-utils/xine_check.c
+++ b/src/xine-utils/xine_check.c
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* Xine Health Check:
*
diff --git a/src/xine-utils/xine_mutex.c b/src/xine-utils/xine_mutex.c
index e6b5025c8..9c2943ea0 100644
--- a/src/xine-utils/xine_mutex.c
+++ b/src/xine-utils/xine_mutex.c
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* $Id: xine_mutex.c,v 1.5 2006/07/16 14:45:24 dsalt Exp $
*
diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h
index 980586b7d..9750eefad 100644
--- a/src/xine-utils/xineutils.h
+++ b/src/xine-utils/xineutils.h
@@ -15,7 +15,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*
* $Id: xineutils.h,v 1.107 2006/12/25 15:16:33 dgp85 Exp $
*
diff --git a/src/xine-utils/xmllexer.c b/src/xine-utils/xmllexer.c
index c0f314699..a9fcd9e31 100644
--- a/src/xine-utils/xmllexer.c
+++ b/src/xine-utils/xmllexer.c
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU Library General Public
* License along with the Gnome Library; see the file COPYING.LIB. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+ * Floor, Boston, MA 02110, USA
*
* $Id: xmllexer.c,v 1.13 2007/03/04 16:19:12 hadess Exp $
*
@@ -39,6 +39,9 @@
#include <ctype.h>
#include <string.h>
#include <stdlib.h>
+#ifdef HAVE_ICONV
+#include <iconv.h>
+#endif
/* private constants*/
@@ -521,7 +524,7 @@ char *lexer_decode_entities (const char *tok)
{
/* parse the character entity (on failure, treat it as literal text) */
const char *tp = tok;
- long i;
+ signed long i;
for (i = 0; lexer_entities[i].code; ++i)
if (!strncmp (lexer_entities[i].name, tok, lexer_entities[i].namelen)
@@ -549,7 +552,7 @@ char *lexer_decode_entities (const char *tok)
else
i = strtol (tp, (char **)&tp, 10);
- if (i < 1 || i > 255 || *tp != ';')
+ if (*tp != ';' || i < 1)
{
/* out of range, or format error */
*bp++ = '&';
@@ -557,7 +560,23 @@ char *lexer_decode_entities (const char *tok)
}
tok = tp + 1;
- *bp++ = i;
+
+ if (i < 128)
+ /* ASCII - store as-is */
+ *bp++ = i;
+ else
+ {
+ /* Non-ASCII, so convert to UTF-8 */
+ int count = (i >= 0x04000000) ? 5 :
+ (i >= 0x00200000) ? 4 :
+ (i >= 0x00010000) ? 3 :
+ (i >= 0x00000800) ? 2 : 1;
+ *bp = (char)(0x1F80 >> count);
+ count *= 6;
+ *bp++ |= i >> count;
+ while ((count -= 6) >= 0)
+ *bp++ = 128 | ((i >> count) & 0x3F);
+ }
}
}
*bp = 0;
diff --git a/src/xine-utils/xmllexer.h b/src/xine-utils/xmllexer.h
index 524049a44..5b6ce8311 100644
--- a/src/xine-utils/xmllexer.h
+++ b/src/xine-utils/xmllexer.h
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU Library General Public
* License along with the Gnome Library; see the file COPYING.LIB. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+ * Floor, Boston, MA 02110, USA
*
* $Id: xmllexer.h,v 1.8 2007/03/04 16:19:12 hadess Exp $
*
diff --git a/src/xine-utils/xmlparser.c b/src/xine-utils/xmlparser.c
index 66ab28ce4..21d5a6de9 100644
--- a/src/xine-utils/xmlparser.c
+++ b/src/xine-utils/xmlparser.c
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU Library General Public
* License along with the Gnome Library; see the file COPYING.LIB. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+ * Floor, Boston, MA 02110, USA
*
* $Id: xmlparser.c,v 1.16 2007/03/04 16:19:12 hadess Exp $
*
diff --git a/src/xine-utils/xmlparser.h b/src/xine-utils/xmlparser.h
index 420f2c36c..2536e079f 100644
--- a/src/xine-utils/xmlparser.h
+++ b/src/xine-utils/xmlparser.h
@@ -15,8 +15,8 @@
*
* You should have received a copy of the GNU Library General Public
* License along with the Gnome Library; see the file COPYING.LIB. If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+ * Floor, Boston, MA 02110, USA
*
* $Id: xmlparser.h,v 1.6 2007/03/04 16:19:12 hadess Exp $
*
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 09:22:33 +0000