From e51f499edfe7e7732307af98c043d9ce2fbc9ad3 Mon Sep 17 00:00:00 2001 From: Ryan Lucia Date: Mon, 25 Nov 2019 14:01:16 -0500 Subject: [PATCH] Change signature, add cast Commit migrated from https://github.com/mono/mono/commit/9c1cae02cac33cfa215611211932a4d4c78dcd5f --- src/mono/mono/eglib/eglib-remap.h | 2 +- src/mono/mono/eglib/glib.h | 2 +- src/mono/mono/eglib/gstr.c | 4 ++-- src/mono/mono/metadata/native-library.c | 2 +- src/mono/mono/mini/main.c | 12 ++++++------ 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/mono/mono/eglib/eglib-remap.h b/src/mono/mono/eglib/eglib-remap.h index 8a41af9..88f7675 100644 --- a/src/mono/mono/eglib/eglib-remap.h +++ b/src/mono/mono/eglib/eglib-remap.h @@ -235,7 +235,7 @@ #define g_strndup monoeg_g_strndup #define g_strnfill monoeg_g_strnfill #define g_strnlen monoeg_g_strnlen -#define g_str_from_region monoeg_g_str_from_region +#define g_str_from_file_region monoeg_g_str_from_file_region #define g_strreverse monoeg_g_strreverse #define g_strsplit monoeg_g_strsplit #define g_strsplit_set monoeg_g_strsplit_set diff --git a/src/mono/mono/eglib/glib.h b/src/mono/mono/eglib/glib.h index 7556fcc..2c45d58 100644 --- a/src/mono/mono/eglib/glib.h +++ b/src/mono/mono/eglib/glib.h @@ -379,7 +379,7 @@ gchar *g_strchomp (gchar *str); void g_strdown (gchar *string); gchar *g_strnfill (gsize length, gchar fill_char); gsize g_strnlen (const char*, gsize); -char *g_str_from_region (gint fd, guint64 offset, guint64 size); +char *g_str_from_file_region (int fd, guint64 offset, gsize size); void g_strdelimit (char *string, char delimiter, char new_delimiter); gchar *g_strescape (const gchar *source, const gchar *exceptions); diff --git a/src/mono/mono/eglib/gstr.c b/src/mono/mono/eglib/gstr.c index 7ad077c..3654372 100644 --- a/src/mono/mono/eglib/gstr.c +++ b/src/mono/mono/eglib/gstr.c @@ -1136,7 +1136,7 @@ g_strnlen (const char* s, gsize n) * on error. */ char * -g_str_from_region (gint fd, guint64 offset, guint64 size) +g_str_from_file_region (int fd, guint64 offset, gsize size) { char *buffer; off_t loc; @@ -1147,7 +1147,7 @@ g_str_from_region (gint fd, guint64 offset, guint64 size) } while (loc == -1 && errno == EINTR); if (loc == -1) return NULL; - buffer = g_malloc (size + 1); + buffer = (char *)g_malloc (size + 1); if (buffer == NULL) return NULL; buffer [size] = 0; diff --git a/src/mono/mono/metadata/native-library.c b/src/mono/mono/metadata/native-library.c index 946c1c1..c82ce662 100644 --- a/src/mono/mono/metadata/native-library.c +++ b/src/mono/mono/metadata/native-library.c @@ -1569,7 +1569,7 @@ mono_loader_save_bundled_library (int fd, uint64_t offset, uint64_t size, const bundle_save_library_initialize (); file = g_build_filename (bundled_dylibrary_directory, destfname, (const char*)NULL); - buffer = g_str_from_region (fd, offset, size); + buffer = g_str_from_file_region (fd, offset, size); g_file_set_contents (file, buffer, size, NULL); lib = mono_dl_open (file, MONO_DL_LAZY, &err); diff --git a/src/mono/mono/mini/main.c b/src/mono/mono/mini/main.c index 96acce7..b857ec3 100644 --- a/src/mono/mono/mini/main.c +++ b/src/mono/mono/mini/main.c @@ -232,19 +232,19 @@ probe_embedded (const char *program, int *ref_argc, char **ref_argv []) char *config = kind + strlen ("config:"); char *aname = g_strdup (config); aname [strlen(aname)-strlen(".config")] = 0; - mono_register_config_for_assembly (aname, g_str_from_region (fd, offset, item_size)); + mono_register_config_for_assembly (aname, g_str_from_file_region (fd, offset, item_size)); } else if (strncmp (kind, "systemconfig:", strlen ("systemconfig:")) == 0){ - mono_config_parse_memory (g_str_from_region (fd, offset, item_size)); + mono_config_parse_memory (g_str_from_file_region (fd, offset, item_size)); } else if (strncmp (kind, "options:", strlen ("options:")) == 0){ - mono_parse_options_from (g_str_from_region (fd, offset, item_size), ref_argc, ref_argv); + mono_parse_options_from (g_str_from_file_region (fd, offset, item_size), ref_argc, ref_argv); } else if (strncmp (kind, "config_dir:", strlen ("config_dir:")) == 0){ char *mono_path_value = g_getenv ("MONO_PATH"); - mono_set_dirs (mono_path_value, g_str_from_region (fd, offset, item_size)); + mono_set_dirs (mono_path_value, g_str_from_file_region (fd, offset, item_size)); g_free (mono_path_value); } else if (strncmp (kind, "machineconfig:", strlen ("machineconfig:")) == 0) { - mono_register_machine_config (g_str_from_region (fd, offset, item_size)); + mono_register_machine_config (g_str_from_file_region (fd, offset, item_size)); } else if (strncmp (kind, "env:", strlen ("env:")) == 0){ - char *data = g_str_from_region (fd, offset, item_size); + char *data = g_str_from_file_region (fd, offset, item_size); uint8_t count = *data++; char *value = data + count + 1; g_setenv (data, value, FALSE); -- 2.7.4