luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-02 17:26:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

glib/gqsort.c: Fix C99ism/GCCism

Browse Source 
-There were a number of variables that were declared in the middle of
 the block, so move these declarations to the start of the block
-There was a use of mempcpy, but it is a GCC extension, so use memcpy since
 we didn't care about the return value of the call to mempcpy.

https://bugzilla.gnome.org/show_bug.cgi?id=672095
This commit is contained in:
Chun-wei Fan 2012-03-20 13:19:11 +08:00 committed by Matthias Clasen
parent f23e7c3ef9
commit b08b301223
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glib/gqsort.c
View File

@ -178,7 +178,7 @@ msort_with_tmp (const struct msort_param *p, void *b, size_t n)
} }
else else
{ {
mempcpy (tmp, b2, s); memcpy (tmp, b2, s);
tmp += s; tmp += s;
b2 += s; b2 += s;
--n2; --n2;
@ -226,6 +226,8 @@ msort_r (void *b, size_t n, size_t s, GCompareDataFunc cmp, void *arg)
void **tp = (void **) (p.t + n * sizeof (void *)); void **tp = (void **) (p.t + n * sizeof (void *));
void **t = tp; void **t = tp;
void *tmp_storage = (void *) (tp + n); void *tmp_storage = (void *) (tp + n);
char *kp;
size_t i;
while ((void *) t < tmp_storage) while ((void *) t < tmp_storage)
{ {
@ -238,8 +240,6 @@ msort_r (void *b, size_t n, size_t s, GCompareDataFunc cmp, void *arg)
/* tp[0] .. tp[n - 1] is now sorted, copy around entries of /* tp[0] .. tp[n - 1] is now sorted, copy around entries of
the original array. Knuth vol. 3 (2nd ed.) exercise 5.2-10. */ the original array. Knuth vol. 3 (2nd ed.) exercise 5.2-10. */
char *kp;
size_t i;
for (i = 0, ip = (char *) b; i < n; i++, ip += s) for (i = 0, ip = (char *) b; i < n; i++, ip += s)
if ((kp = tp[i]) != ip) if ((kp = tp[i]) != ip)
{ {