mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-25 15:06:14 +01:00
Misc warning fixes
glib/pcre/pcre_ucp_search_funcs.c, glib/pcre/pcre_valid_utf8.c: add back missing config.h includes, and this time add them to the copies in glib/update-pcre/ too so they don't get lost again on the next PCRE update. glib/garray.c, glib/gbase64.c: fix signed/unsigned pointer casts gio/xdgmime/xdgmimeglob.c: remove unused variable gio/tests/live-g-file.c: fix printf args on x86_64 tests/Makefile.am, tests/regex-test.c: remove redundant -DENABLE_REGEX
This commit is contained in:
parent
36cb01f447
commit
92ac8d165e
@ -458,8 +458,8 @@ test_initial_structure (gconstpointer test_data)
|
|||||||
PATTERN_FILE_SIZE, NULL, &error);
|
PATTERN_FILE_SIZE, NULL, &error);
|
||||||
g_assert_no_error (error);
|
g_assert_no_error (error);
|
||||||
total_read += read;
|
total_read += read;
|
||||||
log (" read %d bytes, total = %d of %d.\n", read, total_read,
|
log (" read %d bytes, total = %d of %d.\n", (int) read,
|
||||||
PATTERN_FILE_SIZE);
|
(int) total_read, PATTERN_FILE_SIZE);
|
||||||
}
|
}
|
||||||
g_assert_cmpint (total_read, ==, PATTERN_FILE_SIZE);
|
g_assert_cmpint (total_read, ==, PATTERN_FILE_SIZE);
|
||||||
|
|
||||||
|
@ -375,7 +375,6 @@ _xdg_glob_hash_lookup_file_name (XdgGlobHash *glob_hash,
|
|||||||
int i, n;
|
int i, n;
|
||||||
MimeWeight mimes[10];
|
MimeWeight mimes[10];
|
||||||
int n_mimes = 10;
|
int n_mimes = 10;
|
||||||
xdg_unichar_t *ucs4;
|
|
||||||
int len;
|
int len;
|
||||||
|
|
||||||
/* First, check the literals */
|
/* First, check the literals */
|
||||||
|
@ -181,7 +181,7 @@ g_array_free (GArray *farray,
|
|||||||
segment = NULL;
|
segment = NULL;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
segment = array->data;
|
segment = (gchar*) array->data;
|
||||||
|
|
||||||
if (preserve_wrapper)
|
if (preserve_wrapper)
|
||||||
{
|
{
|
||||||
|
@ -415,7 +415,7 @@ g_base64_decode_inplace (gchar *text,
|
|||||||
|
|
||||||
*out_len = g_base64_decode_step (text, input_length, (guchar *) text, &state, &save);
|
*out_len = g_base64_decode_step (text, input_length, (guchar *) text, &state, &save);
|
||||||
|
|
||||||
return text;
|
return (guchar *) text;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -43,6 +43,10 @@ POSSIBILITY OF SUCH DAMAGE.
|
|||||||
/* This module contains code for searching the table of Unicode character
|
/* This module contains code for searching the table of Unicode character
|
||||||
properties. */
|
properties. */
|
||||||
|
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
#include "config.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "pcre_internal.h"
|
#include "pcre_internal.h"
|
||||||
|
|
||||||
#include "ucp.h" /* Category definitions */
|
#include "ucp.h" /* Category definitions */
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
#include "config.h"
|
||||||
#include "pcre_internal.h"
|
#include "pcre_internal.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -43,6 +43,10 @@ POSSIBILITY OF SUCH DAMAGE.
|
|||||||
/* This module contains code for searching the table of Unicode character
|
/* This module contains code for searching the table of Unicode character
|
||||||
properties. */
|
properties. */
|
||||||
|
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
#include "config.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "pcre_internal.h"
|
#include "pcre_internal.h"
|
||||||
|
|
||||||
#include "ucp.h" /* Category definitions */
|
#include "ucp.h" /* Category definitions */
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
#include "config.h"
|
||||||
#include "pcre_internal.h"
|
#include "pcre_internal.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -2,18 +2,11 @@ include $(top_srcdir)/Makefile.decl
|
|||||||
|
|
||||||
SUBDIRS=gobject refcount
|
SUBDIRS=gobject refcount
|
||||||
|
|
||||||
if ENABLE_REGEX
|
|
||||||
enable_regex = -DENABLE_REGEX
|
|
||||||
else
|
|
||||||
enable_regex =
|
|
||||||
endif
|
|
||||||
|
|
||||||
AM_CPPFLAGS = \
|
AM_CPPFLAGS = \
|
||||||
-I$(top_srcdir) \
|
-I$(top_srcdir) \
|
||||||
-I$(top_srcdir)/glib \
|
-I$(top_srcdir)/glib \
|
||||||
-I$(top_srcdir)/gmodule \
|
-I$(top_srcdir)/gmodule \
|
||||||
$(GLIB_DEBUG_FLAGS) \
|
$(GLIB_DEBUG_FLAGS)
|
||||||
$(enable_regex)
|
|
||||||
|
|
||||||
AM_CFLAGS = -g
|
AM_CFLAGS = -g
|
||||||
|
|
||||||
|
@ -20,6 +20,8 @@
|
|||||||
#undef G_DISABLE_ASSERT
|
#undef G_DISABLE_ASSERT
|
||||||
#undef G_LOG_DOMAIN
|
#undef G_LOG_DOMAIN
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <locale.h>
|
#include <locale.h>
|
||||||
#include "glib.h"
|
#include "glib.h"
|
||||||
|
Loading…
Reference in New Issue
Block a user