projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[runtime] Fix the exception message to include the proper type name and calling assem...
[mono.git]
/
mono
/
io-layer
/
wapi_glob.c
diff --git
a/mono/io-layer/wapi_glob.c
b/mono/io-layer/wapi_glob.c
index 31c7f6d94111971a913552abda8b601c234446e3..013b778a86579d088ef71551af526cffb572b192 100644
(file)
--- a/
mono/io-layer/wapi_glob.c
+++ b/
mono/io-layer/wapi_glob.c
@@
-266,11
+266,12
@@
globextend(const gchar *path, wapi_glob_t *pglob, size_t *limitp)
const gchar *p;
newsize = sizeof(*pathv) * (2 + pglob->gl_pathc + pglob->gl_offs);
const gchar *p;
newsize = sizeof(*pathv) * (2 + pglob->gl_pathc + pglob->gl_offs);
- pathv = pglob->gl_pathv ? realloc((char *)pglob->gl_pathv, newsize) :
- malloc(newsize);
+ /* FIXME: Can just use realloc(). */
+ pathv = (char **)(pglob->gl_pathv ? g_realloc ((char *)pglob->gl_pathv, newsize) :
+ g_malloc (newsize));
if (pathv == NULL) {
if (pglob->gl_pathv) {
if (pathv == NULL) {
if (pglob->gl_pathv) {
-
free
(pglob->gl_pathv);
+
g_free
(pglob->gl_pathv);
pglob->gl_pathv = NULL;
}
return(WAPI_GLOB_NOSPACE);
pglob->gl_pathv = NULL;
}
return(WAPI_GLOB_NOSPACE);
@@
-288,9
+289,9
@@
globextend(const gchar *path, wapi_glob_t *pglob, size_t *limitp)
;
len = (size_t)(p - path);
*limitp += len;
;
len = (size_t)(p - path);
*limitp += len;
- if ((copy = malloc(len)) != NULL) {
+ if ((copy =
(char *)
malloc(len)) != NULL) {
if (g_Ctoc(path, copy, len)) {
if (g_Ctoc(path, copy, len)) {
-
free
(copy);
+
g_free
(copy);
return(WAPI_GLOB_NOSPACE);
}
pathv[pglob->gl_offs + pglob->gl_pathc++] = copy;
return(WAPI_GLOB_NOSPACE);
}
pathv[pglob->gl_offs + pglob->gl_pathc++] = copy;
@@
-360,8
+361,8
@@
_wapi_globfree(wapi_glob_t *pglob)
pp = pglob->gl_pathv + pglob->gl_offs;
for (i = pglob->gl_pathc; i--; ++pp)
if (*pp)
pp = pglob->gl_pathv + pglob->gl_offs;
for (i = pglob->gl_pathc; i--; ++pp)
if (*pp)
-
free
(*pp);
-
free
(pglob->gl_pathv);
+
g_free
(*pp);
+
g_free
(pglob->gl_pathv);
pglob->gl_pathv = NULL;
}
}
pglob->gl_pathv = NULL;
}
}