projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix minor mem leak in test case
[platform/upstream/glib.git]
/
gio
/
glib-compile-schemas.c
diff --git
a/gio/glib-compile-schemas.c
b/gio/glib-compile-schemas.c
index
bfac84a
..
e42949b
100644
(file)
--- a/
gio/glib-compile-schemas.c
+++ b/
gio/glib-compile-schemas.c
@@
-12,9
+12,7
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*
* Author: Ryan Lortie <desrt@desrt.ca>
*/
*
* Author: Ryan Lortie <desrt@desrt.ca>
*/
@@
-29,13
+27,13
@@
#include <stdio.h>
#include <locale.h>
#include <stdio.h>
#include <locale.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
#include "gvdb/gvdb-builder.h"
#include "strinfo.c"
#include "gvdb/gvdb-builder.h"
#include "strinfo.c"
+#ifdef G_OS_WIN32
+#include "glib/glib-private.h"
+#endif
+
static void
strip_string (GString *string)
{
static void
strip_string (GString *string)
{
@@
-1122,7
+1120,7
@@
parse_state_start_schema (ParseState *state,
{
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_INVALID_CONTENT,
{
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_INVALID_CONTENT,
- _("<schema id='%s'> extends not
-yet-
existing "
+ _("<schema id='%s'> extends not
yet
existing "
"schema '%s'"), id, extends_name);
return;
}
"schema '%s'"), id, extends_name);
return;
}
@@
-1138,7
+1136,7
@@
parse_state_start_schema (ParseState *state,
{
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_INVALID_CONTENT,
{
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_INVALID_CONTENT,
- _("<schema id='%s'> is list of not
-yet-
existing "
+ _("<schema id='%s'> is list of not
yet
existing "
"schema '%s'"), id, list_of);
return;
}
"schema '%s'"), id, list_of);
return;
}
@@
-1724,7
+1722,8
@@
parse_gschema_files (gchar **files,
context = g_markup_parse_context_new (&parser,
G_MARKUP_TREAT_CDATA_AS_TEXT |
context = g_markup_parse_context_new (&parser,
G_MARKUP_TREAT_CDATA_AS_TEXT |
- G_MARKUP_PREFIX_ERROR_POSITION,
+ G_MARKUP_PREFIX_ERROR_POSITION |
+ G_MARKUP_IGNORE_QUALIFIED,
&state, NULL);
&state, NULL);
@@
-1857,8
+1856,8
@@
set_overrides (GHashTable *schema_table,
if (state == NULL)
{
if (state == NULL)
{
- fprintf (stderr, _("No such key
`%s' in schema `
%s' as "
- "specified in override file
`
%s'"),
+ fprintf (stderr, _("No such key
'%s' in schema '
%s' as "
+ "specified in override file
'
%s'"),
key, group, filename);
if (!strict)
key, group, filename);
if (!strict)
@@
-1883,8
+1882,8
@@
set_overrides (GHashTable *schema_table,
if (value == NULL)
{
if (value == NULL)
{
- fprintf (stderr, _("error parsing key
`%s' in schema `
%s' "
- "as specified in override file
`
%s': "
+ fprintf (stderr, _("error parsing key
'%s' in schema '
%s' "
+ "as specified in override file
'
%s': "
"%s."),
key, group, filename, error->message);
"%s."),
key, group, filename, error->message);
@@
-1911,8
+1910,8
@@
set_overrides (GHashTable *schema_table,
g_variant_compare (value, state->maximum) > 0)
{
fprintf (stderr,
g_variant_compare (value, state->maximum) > 0)
{
fprintf (stderr,
- _("override for key
`%s' in schema `
%s' in "
- "override file
`
%s' is outside the range "
+ _("override for key
'%s' in schema '
%s' in "
+ "override file
'
%s' is outside the range "
"given in the schema"),
key, group, filename);
"given in the schema"),
key, group, filename);
@@
-1939,8
+1938,8
@@
set_overrides (GHashTable *schema_table,
if (!is_valid_choices (value, state->strinfo))
{
fprintf (stderr,
if (!is_valid_choices (value, state->strinfo))
{
fprintf (stderr,
- _("override for key
`%s' in schema `
%s' in "
- "override file
`
%s' is not in the list "
+ _("override for key
'%s' in schema '
%s' in "
+ "override file
'
%s' is not in the list "
"of valid choices"),
key, group, filename);
"of valid choices"),
key, group, filename);
@@
-2003,7
+2002,6
@@
main (int argc, char **argv)
};
#ifdef G_OS_WIN32
};
#ifdef G_OS_WIN32
- extern gchar *_glib_get_locale_dir (void);
gchar *tmp;
#endif
gchar *tmp;
#endif