From 4eb63cb7d677b1df2b6d14598e72f45a55e2f77e Mon Sep 17 00:00:00 2001 From: Cedric Bastoul Date: Tue, 27 Sep 2011 17:36:52 +0200 Subject: [PATCH] Remove useless dump function from the interface --- doc/openscop.texi | 3 --- include/osl/interface.h | 2 -- source/extensions/arrays.c | 1 - source/extensions/comment.c | 1 - source/extensions/irregular.c | 1 - source/extensions/lines.c | 1 - source/extensions/textual.c | 1 - source/interface.c | 3 --- source/strings.c | 1 - 9 files changed, 14 deletions(-) diff --git a/doc/openscop.texi b/doc/openscop.texi index 45e4e45..63aa094 100644 --- a/doc/openscop.texi +++ b/doc/openscop.texi @@ -1931,7 +1931,6 @@ the next element of the list. @example @group typedef void (*osl_idump_f) (FILE *, void *, int); -typedef void (*osl_dump_f) (FILE *, void *); typedef char * (*osl_sprint_f)(void *); typedef void * (*osl_sread_f) (char *); typedef void * (*osl_malloc_f)(); @@ -1942,7 +1941,6 @@ typedef int (*osl_equal_f) (void *, void *); struct osl_interface @{ char * URI; /* Unique interface identifier string */ osl_idump_f idump; /* Pointer to the idump function */ - osl_dump_f dump; /* Pointer to the dump function */ osl_sprint_f sprint; /* Pointer to the sprint function */ osl_sread_f sread; /* Pointer to the sread function */ osl_malloc_f malloc; /* Pointer to the malloc function */ @@ -2973,7 +2971,6 @@ strict): default extensions): @itemize @bullet @item @code{osl_foo_idump} (@pxref{Dumping}) - @item @code{osl_foo_dump} (@pxref{Dumping}) @item @code{osl_foo_sprint} has the following prototype: @example @group diff --git a/include/osl/interface.h b/include/osl/interface.h index 5f9ae75..cc61ae4 100644 --- a/include/osl/interface.h +++ b/include/osl/interface.h @@ -73,7 +73,6 @@ extern "C" typedef void (*osl_idump_f) (FILE *, void *, int); -typedef void (*osl_dump_f) (FILE *, void *); typedef char * (*osl_sprint_f)(void *); typedef void * (*osl_sread_f) (char *); typedef void * (*osl_malloc_f)(); @@ -90,7 +89,6 @@ typedef int (*osl_equal_f) (void *, void *); struct osl_interface { char * URI; /**< Unique identifier string */ osl_idump_f idump; /**< Pointer to idump function */ - osl_dump_f dump; /**< Pointer to dump function */ osl_sprint_f sprint; /**< Pointer to sprint function */ osl_sread_f sread; /**< Pointer to sread function */ osl_malloc_f malloc; /**< Pointer to malloc function */ diff --git a/source/extensions/arrays.c b/source/extensions/arrays.c index 83bd317..cf87a4d 100644 --- a/source/extensions/arrays.c +++ b/source/extensions/arrays.c @@ -436,7 +436,6 @@ osl_interface_p osl_arrays_interface() { interface->URI = strdup(OSL_URI_ARRAYS); interface->idump = (osl_idump_f)osl_arrays_idump; - interface->dump = (osl_dump_f)osl_arrays_dump; interface->sprint = (osl_sprint_f)osl_arrays_sprint; interface->sread = (osl_sread_f)osl_arrays_sread; interface->malloc = (osl_malloc_f)osl_arrays_malloc; diff --git a/source/extensions/comment.c b/source/extensions/comment.c index f692ecc..ef1103c 100644 --- a/source/extensions/comment.c +++ b/source/extensions/comment.c @@ -297,7 +297,6 @@ osl_interface_p osl_comment_interface() { interface->URI = strdup(OSL_URI_COMMENT); interface->idump = (osl_idump_f)osl_comment_idump; - interface->dump = (osl_dump_f)osl_comment_dump; interface->sprint = (osl_sprint_f)osl_comment_sprint; interface->sread = (osl_sread_f)osl_comment_sread; interface->malloc = (osl_malloc_f)osl_comment_malloc; diff --git a/source/extensions/irregular.c b/source/extensions/irregular.c index 292f47a..87c69e8 100644 --- a/source/extensions/irregular.c +++ b/source/extensions/irregular.c @@ -743,7 +743,6 @@ osl_interface_p osl_irregular_interface() { interface->URI = strdup(OSL_URI_IRREGULAR); interface->idump = (osl_idump_f)osl_irregular_idump; - interface->dump = (osl_dump_f)osl_irregular_dump; interface->sprint = (osl_sprint_f)osl_irregular_sprint; interface->sread = (osl_sread_f)osl_irregular_sread; interface->malloc = (osl_malloc_f)osl_irregular_malloc; diff --git a/source/extensions/lines.c b/source/extensions/lines.c index 016ad48..d0f8ae3 100644 --- a/source/extensions/lines.c +++ b/source/extensions/lines.c @@ -296,7 +296,6 @@ osl_interface_p osl_lines_interface() { interface->URI = strdup(OSL_URI_LINES); interface->idump = (osl_idump_f)osl_lines_idump; - interface->dump = (osl_dump_f)osl_lines_dump; interface->sprint = (osl_sprint_f)osl_lines_sprint; interface->sread = (osl_sread_f)osl_lines_sread; interface->malloc = (osl_malloc_f)osl_lines_malloc; diff --git a/source/extensions/textual.c b/source/extensions/textual.c index 084b164..4fdb0a5 100644 --- a/source/extensions/textual.c +++ b/source/extensions/textual.c @@ -318,7 +318,6 @@ osl_interface_p osl_textual_interface() { interface->URI = strdup(OSL_URI_TEXTUAL); interface->idump = (osl_idump_f)osl_textual_idump; - interface->dump = (osl_dump_f)osl_textual_dump; interface->sprint = (osl_sprint_f)osl_textual_sprint; interface->sread = (osl_sread_f)osl_textual_sread; interface->malloc = (osl_malloc_f)osl_textual_malloc; diff --git a/source/interface.c b/source/interface.c index 1648bd8..f81a196 100644 --- a/source/interface.c +++ b/source/interface.c @@ -197,7 +197,6 @@ osl_interface_p osl_interface_malloc() { sizeof(osl_interface_t)); interface->URI = NULL; interface->idump = NULL; - interface->dump = NULL; interface->sprint = NULL; interface->sread = NULL; interface->malloc = NULL; @@ -255,7 +254,6 @@ osl_interface_p osl_interface_nclone(osl_interface_p interface, int n) { new = osl_interface_malloc(); OSL_strdup(new->URI, interface->URI); new->idump = interface->idump; - new->dump = interface->dump; new->sprint = interface->sprint; new->sread = interface->sread; new->malloc = interface->malloc; @@ -305,7 +303,6 @@ int osl_interface_equal(osl_interface_p interface1, if (strcmp(interface1->URI, interface2->URI) || (interface1->idump != interface2->idump) || - (interface1->dump != interface2->dump) || (interface1->sprint != interface2->sprint) || (interface1->sread != interface2->sread) || (interface1->malloc != interface2->malloc) || diff --git a/source/strings.c b/source/strings.c index aaaee3e..0b7e160 100644 --- a/source/strings.c +++ b/source/strings.c @@ -410,7 +410,6 @@ osl_interface_p osl_strings_interface() { interface->URI = strdup(OSL_URI_STRINGS); interface->idump = (osl_idump_f)osl_strings_idump; - interface->dump = (osl_dump_f)osl_strings_dump; interface->sprint = (osl_sprint_f)osl_strings_sprint; interface->sread = (osl_sread_f)osl_strings_sread; interface->malloc = (osl_malloc_f)osl_strings_malloc; -- 2.11.4.GIT