AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-22 19:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid compiler warnings in qsort/bsearch examples

Browse Source
This commit is contained in:
Andreas Jaeger 2012-05-17 11:05:52 +02:00
parent 48970aba30
commit e39745ffa0
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 2012-05-16 H.J. Lu <hongjiu.lu@intel.com>
* bits/types.h: Fold copyright years. * bits/types.h: Fold copyright years.

5
manual/examples/search.c
View File

@ -53,8 +53,11 @@ int count = sizeof (muppets) / sizeof (struct critter);
/* This is the comparison function used for sorting and searching. */ /* This is the comparison function used for sorting and searching. */
int 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); return strcmp (c1->name, c2->name);
} }

10
manual/string.texi
View File

@ -1370,8 +1370,11 @@ efficiently using @code{strxfrm}.)
/* @r{This is the comparison function used with @code{qsort}.} */ /* @r{This is the comparison function used with @code{qsort}.} */
int 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); return strcoll (*p1, *p2);
@} @}
@ -1462,8 +1465,11 @@ struct sorter @{ char *input; char *transformed; @};
@r{to sort an array of @code{struct sorter}.} */ @r{to sort an array of @code{struct sorter}.} */
int 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); return strcmp (p1->transformed, p2->transformed);
@} @}