diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | manual/examples/search.c | 5 | ||||
| -rw-r--r-- | manual/string.texi | 10 |
3 files changed, 18 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index a52484ee99..f6dbf4064f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-05-17 Andreas Jaeger <aj@suse.de> + + * manual/examples/search.c (critter_cmp): Change signature to + avoid warnings. + * manual/string.texi (Collation Functions): Likewise. + 2012-05-16 H.J. Lu <hongjiu.lu@intel.com> * bits/types.h: Fold copyright years. diff --git a/manual/examples/search.c b/manual/examples/search.c index e37656721b..7fe05ea2d9 100644 --- a/manual/examples/search.c +++ b/manual/examples/search.c @@ -53,8 +53,11 @@ int count = sizeof (muppets) / sizeof (struct critter); /* This is the comparison function used for sorting and searching. */ int -critter_cmp (const struct critter *c1, const struct critter *c2) +critter_cmp (const void *v1, const void *v2) { + const struct critter *c1 = v1; + const struct critter *c2 = v2; + return strcmp (c1->name, c2->name); } diff --git a/manual/string.texi b/manual/string.texi index 5051f545c1..831873b126 100644 --- a/manual/string.texi +++ b/manual/string.texi @@ -1370,8 +1370,11 @@ efficiently using @code{strxfrm}.) /* @r{This is the comparison function used with @code{qsort}.} */ int -compare_elements (char **p1, char **p2) +compare_elements (const void *v1, const void *v2) @{ + char * const *p1 = v1; + char * const *p1 = v2; + return strcoll (*p1, *p2); @} @@ -1462,8 +1465,11 @@ struct sorter @{ char *input; char *transformed; @}; @r{to sort an array of @code{struct sorter}.} */ int -compare_elements (struct sorter *p1, struct sorter *p2) +compare_elements (const void *v1, const void *v2) @{ + const struct sorter *p1 = v1; + const struct sorter *p2 = v2; + return strcmp (p1->transformed, p2->transformed); @} |