summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2015-09-11 18:08:33 -0400
committerMatthias Clasen <mclasen@redhat.com>2015-09-12 11:13:45 -0400
commit627854fee1fde93e01f27655b00a9082348ee15f (patch)
tree11c82e31fc4f8e7503c83fb162f23716ffdc2f4e
parent97a25d12031b07540c95387cb434ee5c87b82c46 (diff)
downloadglib-627854fee1fde93e01f27655b00a9082348ee15f.tar.gz
Cleanups after we dropped mem vtables
Since g_malloc is now always malloc, we can just use strdup and strndup directly.
-rw-r--r--glib/gstrfuncs.c25
1 files changed, 4 insertions, 21 deletions
diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
index dde612668..a251631f3 100644
--- a/glib/gstrfuncs.c
+++ b/glib/gstrfuncs.c
@@ -354,19 +354,10 @@ get_C_locale (void)
gchar*
g_strdup (const gchar *str)
{
- gchar *new_str;
- gsize length;
-
if (str)
- {
- length = strlen (str) + 1;
- new_str = g_new (char, length);
- memcpy (new_str, str, length);
- }
+ return strdup (str);
else
- new_str = NULL;
-
- return new_str;
+ return NULL;
}
/**
@@ -418,18 +409,10 @@ gchar*
g_strndup (const gchar *str,
gsize n)
{
- gchar *new_str;
-
if (str)
- {
- new_str = g_new (gchar, n + 1);
- strncpy (new_str, str, n);
- new_str[n] = '\0';
- }
+ return strndup (str, n);
else
- new_str = NULL;
-
- return new_str;
+ return NULL;
}
/**