Hi GNU PDFists, Here is a patch for FS#115 with casting. Note that we still need stdbool.h, I guess wa can't get rid of it.
## # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: [email protected] # target_branch: file:///home/gerel/PROJECTS/libgnupdf/trunk/ # testament_sha1: 0155c1fbc97ce593fa84332f814224842c8b2784 # timestamp: 2010-04-17 18:20:59 -0300 # base_revision_id: jema...@termi-20100415170352-xrpun2k7cqbeu79j # # Begin patch === modified file 'ChangeLog' --- ChangeLog 2010-04-15 15:58:08 +0000 +++ ChangeLog 2010-04-17 21:20:56 +0000 @@ -1,3 +1,32 @@ +2010-04-17 Gerardo E. Gidoni <[email protected]> + + Updated pdf_list_element_equals_fn_t to return pdf_bool_t + * doc/gnupdf.texi: updated documentation. + + * src/base/pdf-list.h: updated definition. + + * torture/unit/base/list/pdf-list-add-first.c: likewise. + + * torture/unit/base/list/pdf-list-destroy.c: likewise. + + * torture/unit/base/list/pdf-list-new.c: likewise. + + * torture/unit/base/list/pdf-list-remove.c: likewise. + + * torture/unit/base/list/pdf-list-search-from-to.c: likewise. + + * torture/unit/base/list/pdf-list-search-from.c: likewise. + + * torture/unit/base/list/pdf-list-search.c: likewise. + + * torture/unit/base/list/pdf-list-sorted-add.c: likewise. + + * torture/unit/base/list/pdf-list-sorted-remove.c: likewise. + + * torture/unit/base/list/pdf-list-sorted-search-from-to.c: likewise. + + * torture/unit/base/list/pdf-list-sorted-search.c: likewise. + 2010-04-15 Jose E. Marchesi <[email protected]> Remove spurious blank lines before EOF in the codebase. === modified file 'doc/gnupdf.texi' --- doc/gnupdf.texi 2010-04-08 19:48:04 +0000 +++ doc/gnupdf.texi 2010-04-17 21:20:56 +0000 @@ -3027,7 +3027,7 @@ A list iterator. @end deftp -...@deftp {Data Type} bool (*pdf_list_element_equals_fn_t) (const void *elt1, const void *elt2) +...@deftp {Data Type} pdf_bool_t (*pdf_list_element_equals_fn_t) (const void *elt1, const void *elt2) A function type for comparing list elements equality. Should return PDF_TRUE in case they are equal and PDF_FALSE otherwise. @end deftp === modified file 'src/base/pdf-list.h' --- src/base/pdf-list.h 2010-04-15 15:07:50 +0000 +++ src/base/pdf-list.h 2010-04-17 21:20:56 +0000 @@ -64,7 +64,7 @@ typedef struct pdf_list_node_s pdf_list_node_t; typedef struct pdf_list_iterator_s pdf_list_iterator_t; -typedef bool (*pdf_list_element_equals_fn_t) (const void *elt1, const void *elt2); +typedef pdf_bool_t (*pdf_list_element_equals_fn_t) (const void *elt1, const void *elt2); typedef pdf_size_t (*pdf_list_element_hashcode_fn_t) (const void *elt); typedef void (*pdf_list_element_dispose_fn_t) (const void *elt); typedef int (*pdf_list_element_compar_fn_t) (const void *elt1, const void *elt2); @@ -197,8 +197,9 @@ if (list != NULL) { - list->gl_list = gl_list_nx_create_empty(GL_ARRAY_LIST, equals_fn, NULL, - dispose_fn, allow_duplicates); + list->gl_list = gl_list_nx_create_empty(GL_ARRAY_LIST, + (bool(*)(const void*,const void *))equals_fn, + NULL,dispose_fn, allow_duplicates); list->allow_duplicates = allow_duplicates; if (list->gl_list == NULL) === modified file 'torture/unit/base/list/pdf-list-add-first.c' --- torture/unit/base/list/pdf-list-add-first.c 2010-02-20 16:02:07 +0000 +++ torture/unit/base/list/pdf-list-add-first.c 2010-04-17 21:20:56 +0000 @@ -25,12 +25,12 @@ #include <config.h> -#include <stdbool.h> + #include <stdio.h> #include <pdf.h> #include <check.h> -extern bool l_comp (const void * elemb, const void * elema); +extern pdf_bool_t l_comp (const void * elemb, const void * elema); /* * Test: pdf_list_add_first_001 === modified file 'torture/unit/base/list/pdf-list-destroy.c' --- torture/unit/base/list/pdf-list-destroy.c 2010-02-20 16:02:07 +0000 +++ torture/unit/base/list/pdf-list-destroy.c 2010-04-17 21:20:56 +0000 @@ -25,7 +25,6 @@ #include <config.h> -#include <stdbool.h> #include <stdio.h> #include <pdf.h> #include <check.h> === modified file 'torture/unit/base/list/pdf-list-new.c' --- torture/unit/base/list/pdf-list-new.c 2010-02-20 16:02:07 +0000 +++ torture/unit/base/list/pdf-list-new.c 2010-04-17 21:20:56 +0000 @@ -25,13 +25,12 @@ #include <config.h> -#include <stdbool.h> #include <stdio.h> #include <pdf.h> #include <check.h> -bool l_comp (const void * elemb, const void * elema) +pdf_bool_t l_comp (const void * elemb, const void * elema) { int *elem1, *elem2; elem1 = (int*) elema; === modified file 'torture/unit/base/list/pdf-list-remove.c' --- torture/unit/base/list/pdf-list-remove.c 2010-02-20 16:02:07 +0000 +++ torture/unit/base/list/pdf-list-remove.c 2010-04-17 21:20:56 +0000 @@ -25,12 +25,11 @@ #include <config.h> -#include <stdbool.h> #include <stdio.h> #include <pdf.h> #include <check.h> -extern bool l_comp (const void * elemb, const void * elema); +extern pdf_bool_t l_comp (const void * elemb, const void * elema); /* * Test: pdf_list_remove_001 === modified file 'torture/unit/base/list/pdf-list-search-from-to.c' --- torture/unit/base/list/pdf-list-search-from-to.c 2010-02-20 16:02:07 +0000 +++ torture/unit/base/list/pdf-list-search-from-to.c 2010-04-17 21:20:56 +0000 @@ -25,12 +25,11 @@ #include <config.h> -#include <stdbool.h> #include <stdio.h> #include <pdf.h> #include <check.h> -extern bool l_comp (const void * elemb, const void * elema); +extern pdf_bool_t l_comp (const void * elemb, const void * elema); /* * Test: pdf_list_search_from_to_001 === modified file 'torture/unit/base/list/pdf-list-search-from.c' --- torture/unit/base/list/pdf-list-search-from.c 2010-02-20 16:02:07 +0000 +++ torture/unit/base/list/pdf-list-search-from.c 2010-04-17 21:20:56 +0000 @@ -25,12 +25,12 @@ #include <config.h> -#include <stdbool.h> + #include <stdio.h> #include <pdf.h> #include <check.h> -extern bool l_comp (const void * elemb, const void * elema); +extern pdf_bool_t l_comp (const void * elemb, const void * elema); /* === modified file 'torture/unit/base/list/pdf-list-search.c' --- torture/unit/base/list/pdf-list-search.c 2010-02-20 16:02:07 +0000 +++ torture/unit/base/list/pdf-list-search.c 2010-04-17 21:20:56 +0000 @@ -25,12 +25,12 @@ #include <config.h> -#include <stdbool.h> + #include <stdio.h> #include <pdf.h> #include <check.h> -extern bool l_comp (const void * elemb, const void * elema); +extern pdf_bool_t l_comp (const void * elemb, const void * elema); /* * Test: pdf_list_search_001 === modified file 'torture/unit/base/list/pdf-list-sorted-add.c' --- torture/unit/base/list/pdf-list-sorted-add.c 2010-02-20 16:02:07 +0000 +++ torture/unit/base/list/pdf-list-sorted-add.c 2010-04-17 21:20:56 +0000 @@ -25,12 +25,11 @@ #include <config.h> -#include <stdbool.h> #include <stdio.h> #include <pdf.h> #include <check.h> -extern bool l_comp (const void * elemb, const void * elema); +extern pdf_bool_t l_comp (const void * elemb, const void * elema); extern int l_comp_desc (const void *elema, const void * elemb); extern int l_comp_asc (const void *elema, const void * elemb); === modified file 'torture/unit/base/list/pdf-list-sorted-remove.c' --- torture/unit/base/list/pdf-list-sorted-remove.c 2010-02-20 16:02:07 +0000 +++ torture/unit/base/list/pdf-list-sorted-remove.c 2010-04-17 21:20:56 +0000 @@ -25,12 +25,12 @@ #include <config.h> -#include <stdbool.h> + #include <stdio.h> #include <pdf.h> #include <check.h> -extern bool l_comp (const void * elemb, const void * elema); +extern pdf_bool_t l_comp (const void * elemb, const void * elema); extern int l_comp_desc (const void *elema, const void * elemb); extern int l_comp_asc (const void *elema, const void * elemb); === modified file 'torture/unit/base/list/pdf-list-sorted-search-from-to.c' --- torture/unit/base/list/pdf-list-sorted-search-from-to.c 2010-02-20 16:02:07 +0000 +++ torture/unit/base/list/pdf-list-sorted-search-from-to.c 2010-04-17 21:20:56 +0000 @@ -25,12 +25,11 @@ #include <config.h> -#include <stdbool.h> #include <stdio.h> #include <pdf.h> #include <check.h> -extern bool l_comp (const void * elemb, const void * elema); +extern pdf_bool_t l_comp (const void * elemb, const void * elema); extern int l_comp_desc (const void *elema, const void * elemb); extern int l_comp_asc (const void *elema, const void * elemb); === modified file 'torture/unit/base/list/pdf-list-sorted-search.c' --- torture/unit/base/list/pdf-list-sorted-search.c 2010-02-20 16:02:07 +0000 +++ torture/unit/base/list/pdf-list-sorted-search.c 2010-04-17 21:20:56 +0000 @@ -25,12 +25,11 @@ #include <config.h> -#include <stdbool.h> #include <stdio.h> #include <pdf.h> #include <check.h> -extern bool l_comp (const void * elemb, const void * elema); +extern pdf_bool_t l_comp (const void * elemb, const void * elema); extern int l_comp_desc (const void *elema, const void * elemb); extern int l_comp_asc (const void *elema, const void * elemb); # Begin bundle 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 RT1uUo/rsUw3K2lvPH/i7kinChIabkNkYA== ### -gerel
