libgsf r1013 - in trunk: . gsf po python

[jody svn gnome org]

Author: jody
Date: Sun Oct 19 12:52:17 2008
New Revision: 1013
URL: http://svn.gnome.org/viewvc/libgsf?rev=1013&view=rev

Log:
2008-10-19  Jody Goldberg <jody gnome org>

	* Release 1.14.10


Modified:
   trunk/ChangeLog
   trunk/gsf/gsf-infile-msvba.c
   trunk/gsf/gsf-input-stdio.c
   trunk/gsf/gsf-msole-utils.c
   trunk/po/ChangeLog
   trunk/python/ChangeLog

Modified: trunk/gsf/gsf-infile-msvba.c
==============================================================================
--- trunk/gsf/gsf-infile-msvba.c	(original)
+++ trunk/gsf/gsf-infile-msvba.c	Sun Oct 19 12:52:17 2008
@@ -180,8 +180,10 @@
 		switch (tag) {
 		case 4:
 			name = g_strndup (ptr, len);
+#ifdef OLD_VBA_DUMP
 			puts ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
 			printf ("<project name=\"%s\">", name);
+#endif
 			g_free (name);
 			break;
 		case 9:
@@ -257,7 +259,9 @@
 
 fail_content :
 	g_free (inflated_data);
+#ifdef OLD_VBA_DUMP
 	puts ("</project>");
+#endif
 
 fail_compression :
 	g_object_unref (G_OBJECT (dir));

Modified: trunk/gsf/gsf-input-stdio.c
==============================================================================
--- trunk/gsf/gsf-input-stdio.c	(original)
+++ trunk/gsf/gsf-input-stdio.c	Sun Oct 19 12:52:17 2008
@@ -57,6 +57,7 @@
  *
  * Returns: a new file or NULL.
  **/
+/* coverity[ -tainted_string_sink_content : arg-0 ] */
 GsfInput *
 gsf_input_stdio_new (char const *filename, GError **err)
 {

Modified: trunk/gsf/gsf-msole-utils.c
==============================================================================
--- trunk/gsf/gsf-msole-utils.c	(original)
+++ trunk/gsf/gsf-msole-utils.c	Sun Oct 19 12:52:17 2008
@@ -2218,6 +2218,8 @@
 		case 0x8001:
 			/* according to OOo docs 8001 is a synonym CP1252 */
 			codepage = 1252;
+			/* fallthrough */
+
 		default:
 			cp_list = g_slist_prepend (cp_list, g_strdup_printf ("CP%u", codepage));
 	}