Revision 7267c094 qstring.c
b/qstring.c | ||
---|---|---|
40 | 40 |
{ |
41 | 41 |
QString *qstring; |
42 | 42 |
|
43 |
qstring = qemu_malloc(sizeof(*qstring));
|
|
43 |
qstring = g_malloc(sizeof(*qstring));
|
|
44 | 44 |
|
45 | 45 |
qstring->length = end - start + 1; |
46 | 46 |
qstring->capacity = qstring->length; |
47 | 47 |
|
48 |
qstring->string = qemu_malloc(qstring->capacity + 1);
|
|
48 |
qstring->string = g_malloc(qstring->capacity + 1);
|
|
49 | 49 |
memcpy(qstring->string, str + start, qstring->length); |
50 | 50 |
qstring->string[qstring->length] = 0; |
51 | 51 |
|
... | ... | |
70 | 70 |
qstring->capacity += len; |
71 | 71 |
qstring->capacity *= 2; /* use exponential growth */ |
72 | 72 |
|
73 |
qstring->string = qemu_realloc(qstring->string, qstring->capacity + 1);
|
|
73 |
qstring->string = g_realloc(qstring->string, qstring->capacity + 1);
|
|
74 | 74 |
} |
75 | 75 |
} |
76 | 76 |
|
... | ... | |
136 | 136 |
|
137 | 137 |
assert(obj != NULL); |
138 | 138 |
qs = qobject_to_qstring(obj); |
139 |
qemu_free(qs->string);
|
|
140 |
qemu_free(qs);
|
|
139 |
g_free(qs->string);
|
|
140 |
g_free(qs);
|
|
141 | 141 |
} |
Also available in: Unified diff